From 4929f15e1642d84c4b9811cb8fc4403ddf004960 Mon Sep 17 00:00:00 2001 From: Jaime Frey Date: Tue, 5 Mar 2024 08:54:08 -0600 Subject: [PATCH] HTCONDOR-2322 Fix CE job route transform for job environment The macros CONDORCE_PILOT_JOB_ENV and default_pilot_job_env should already include quotes, so adding quotes results in a ClassAd syntax error. default_pilot_job_env may be undefined, so set a default of "". --- src/condor_ce_router_defaults | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/condor_ce_router_defaults b/src/condor_ce_router_defaults index 59a327ac..170e323f 100755 --- a/src/condor_ce_router_defaults +++ b/src/condor_ce_router_defaults @@ -13,12 +13,16 @@ JOB_ROUTER_CONFIG = r"""JOB_ROUTER_TRANSFORM_Env @=jrt default_env = $(default_env) HOME=$(use_ce_home) endif + if ! defined default_pilot_job_env + default_pilot_job_env = "" + endif + SET osg_environment "{osg_environment}" EVALSET environment mergeEnvironment("$(default_env)", \ osg_environment, \ orig_environment, \ - "$(CONDORCE_PILOT_JOB_ENV)", \ - "$(default_pilot_job_env)") + $(CONDORCE_PILOT_JOB_ENV), \ + $(default_pilot_job_env)) @jrt JOB_ROUTER_POST_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_POST_ROUTE_TRANSFORM_NAMES) Env