Merge pull request #65 from jvansanten/master

Actually check the value of cvmfs_job_wrapper
WIPACrepo · Feb 2, 2017 · 5680a9f · 5680a9f
2 parents 4acf908 + 5152143
commit 5680a9f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/submit.py b/submit.py
@@ -191,7 +191,7 @@ def write_glidein_part(self, f, local_dir=None, glidein_tarball=None,
             f.write('SITE=$SITE ')
         if 'cluster' in self.config['Glidein']:
             f.write('CLUSTER=$CLUSTER ')
-        if 'cvmfs_job_wrapper' in self.config['SubmitFile']:
+        if self.config['SubmitFile'].get('cvmfs_job_wrapper', False):
             f.write('CVMFS_JOB_WRAPPER=1 ')
         if "CustomEnv" in self.config:
             for k, v in self.config["CustomEnv"].items():
@@ -544,7 +544,7 @@ def make_env_wrapper(self, env_wrapper):
                 f.write('SITE=$SITE ')
             if 'cluster' in self.config['Glidein']:
                 f.write('CLUSTER=$CLUSTER ')
-            if 'cvmfs_job_wrapper' in self.config['SubmitFile']:
+            if self.config['SubmitFile'].get('cvmfs_job_wrapper', False):
                 f.write('CVMFS_JOB_WRAPPER=1 ')
             if "CustomEnv" in self.config:
                 for k, v in self.config["CustomEnv"].items():