From d4c025e8b2f03bb5dea470afc1f84f0682877f20 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Wed, 27 Apr 2022 10:43:40 -0500 Subject: [PATCH 1/2] proper check for environmental --- python/sconstruct_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/sconstruct_helper.py b/python/sconstruct_helper.py index f7622b4..29db46b 100644 --- a/python/sconstruct_helper.py +++ b/python/sconstruct_helper.py @@ -73,7 +73,7 @@ def cppPath(mu2eOpts): # the directory containing the local repos path.append(mu2eOpts["workDir"]) # the backing build areas style - if len(os.environ['MUSE_BACKING'])>0 : + if os.environ.get('MUSE_BACKING') : for bdir in os.environ['MUSE_BACKING'].split(): path.append(bdir) else: From 8ba1ea155112ab397d9da969989a955ab2fed0b3 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Wed, 27 Apr 2022 10:44:24 -0500 Subject: [PATCH 2/2] don't delete links --- bin/museBuild.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/museBuild.sh b/bin/museBuild.sh index fbc1287..c043216 100755 --- a/bin/museBuild.sh +++ b/bin/museBuild.sh @@ -49,9 +49,6 @@ echo -n "$(date +'%D %H:%M:%S to ')" > $MUSE_BUILD_DIR/.musebuild # this is used to indicate the repos were built even if it # produces no files in the build area during the scons build -# first remove old links, which may be stale -rm -f $MUSE_BUILD_DIR/link/* - # this should work for old link style and new backing style for REPO in $MUSE_LOCAL_REPOS do