From e6cc277fa2ebecc0aadf6197766245ca58107870 Mon Sep 17 00:00:00 2001
From: Brian Lin <brianhlin@gmail.com>
Date: Mon, 26 Oct 2015 12:04:37 -0500
Subject: [PATCH] Fix to JOB_ROUTER_DEFAULTS classad when UID/extattr mappings
 were not used

---
 src/condor_ce_router_defaults | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/condor_ce_router_defaults b/src/condor_ce_router_defaults
index 21cf949c2..48c24339d 100755
--- 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()