Skip to content

Commit

Permalink
fix: preinstalledEnv tales preference to preinstalledEnvPrefix
Browse files Browse the repository at this point in the history
  • Loading branch information
atsareg committed Nov 2, 2023
1 parent ce2e6c5 commit ffd7709
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
Original file line number Diff line number Diff line change
Expand Up @@ -1027,10 +1027,10 @@ def _getPilotOptions(self, queue, **kwargs):
# Preinstalled environment defined ?
preinstalledEnv = opsHelper.getValue("Pilot/PreinstalledEnv", "")
preinstalledEnvPrefix = opsHelper.getValue("Pilot/PreinstalledEnvPrefix", "")
if preinstalledEnvPrefix:
pilotOptions.append(f"--preinstalledEnvPrefix={preinstalledEnvPrefix}")
elif preinstalledEnv:
if preinstalledEnv:
pilotOptions.append(f"--preinstalledEnv={preinstalledEnv}")
elif preinstalledEnvPrefix:
pilotOptions.append(f"--preinstalledEnvPrefix={preinstalledEnvPrefix}")

# Pilot Logging defined?
if opsHelper.getValue("/Services/JobMonitoring/usePilotsLoggingFlag", False):
Expand Down

0 comments on commit ffd7709

Please sign in to comment.