This fixes a bug that was introduced with the combination of #565 and #551. Namely, for the --global-pool case, we were saving the environment before modifying the collector host, and then directly before submission, restoring it with packages.orig_env().
In this bug, since the original environment is saved during argument parsing, the credentials have not yet been gotten, and thus the BEARER_TOKEN_FILE and X509_USER_PROXY environment settings were wiped when packages.orig_env() is called in condor.submit().
This PR fixes that bug, revealed in the testing of the 1.8-rc1 release.
This fixes a bug that was introduced with the combination of #565 and #551. Namely, for the
--global-pool
case, we were saving the environment before modifying the collector host, and then directly before submission, restoring it withpackages.orig_env()
.In this bug, since the original environment is saved during argument parsing, the credentials have not yet been gotten, and thus the
BEARER_TOKEN_FILE
andX509_USER_PROXY
environment settings were wiped whenpackages.orig_env()
is called incondor.submit()
.This PR fixes that bug, revealed in the testing of the 1.8-rc1 release.