Skip to content

Commit

Permalink
Revert exist_ok changes to scons files (#116)
Browse files Browse the repository at this point in the history
Co-authored-by: Ryan Burns <[email protected]>
  • Loading branch information
rtburns-jpl and rtburns-jpl authored Apr 16, 2020
1 parent 435e802 commit 74f6473
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,11 @@ else:
### End of GPU branch-specific modifications


os.makedirs(inst, exist_ok=True)
env.Install(inst, '__init__.py')
env.Install(inst, 'release_history.py')

if not os.path.exists(inst):
os.makedirs(inst)

v = 0
if isrerun == 'no':
Expand Down
6 changes: 5 additions & 1 deletion configuration/buildHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
def createHelp(env,factoryFile,installDir):
#jng: try to have scons handle all the creation but could not figure out how
# so handled dir creation manually
os.makedirs(env['HELPER_BUILD_DIR'], exist_ok=True)
try:
os.makedirs(env['HELPER_BUILD_DIR'])
except:
# already exists
pass
try:
#one could probably also use __import__ but needs to make sure the
#the cwd is prepended to the sys.path otherwise if factoryFile = __init__.py
Expand Down

0 comments on commit 74f6473

Please sign in to comment.