Merge pull request #50 from brianhlin/master

Fix to JOB_ROUTER_DEFAULTS classad when UID/extattr mappings were not…
htcondor · Oct 26, 2015 · f83ac19 · f83ac19
2 parents 1e0ed57 + e6cc277
commit f83ac19
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/condor_ce_router_defaults b/src/condor_ce_router_defaults
@@ -242,8 +242,8 @@ def main():
 
     try:
         print defaults_with_env.replace("@accounting_group@", accounting_group_str)
-    except TypeError:
-        print defaults_with_env.replace("\n    eval_set_AccountingGroup = @accounting_group@ \\", '')
+    except TypeError: # if no accounting group mappings, remove them from the classad
+        print re.sub(r'.*AccountingGroupOSG.*\n', '', defaults_with_env)
 
 if __name__ == "__main__":
     main()