Skip to content

Commit

Permalink
Merge branch 'ssertel/get-env-fix' into 'main'
Browse files Browse the repository at this point in the history
Fixed an issue in get_env.py that could make the build fail

See merge request lightspeedrtx/bridge-remix-nv!30
  • Loading branch information
SSertel committed Aug 2, 2023
2 parents 44ed02b + fd130af commit fde73a4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ found_tag = ''
ci_commit_tag = ''
get_env_out = run_command(python_interpreter.full_path(),[global_src_root_norm + './scripts-common/get_env.py', 'CI_COMMIT_TAG'])
if get_env_out.returncode() != 0
error('get_env.py failed, which is unexpected')
warning('get_env.py failed, ' + get_env_out.stderr().strip())
else
ci_commit_tag = get_env_out.stdout().replace('\n','')
endif
Expand Down
4 changes: 2 additions & 2 deletions scripts-common/get_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

if len(sys.argv) != 2:
print("ERROR: Must provide one and only one envvar name to get_env.py", sys.stderr)
exit(1)
os._exit(0)
envvar = sys.argv[1]
if envvar in os.environ.keys():
val = os.environ[envvar]
print(val)
exit(0)
os._exit(0)

0 comments on commit fde73a4

Please sign in to comment.