diff --git a/src/lsst/cmservice/handlers/jobs.py b/src/lsst/cmservice/handlers/jobs.py index 078c46b7..81bf84dd 100644 --- a/src/lsst/cmservice/handlers/jobs.py +++ b/src/lsst/cmservice/handlers/jobs.py @@ -125,7 +125,7 @@ async def _write_script( bps_wms_script_template, ) - submit_path = os.path.abspath(os.path.expandvars(f"{prod_area}/{parent.fullname}/submit")) + submit_path = os.path.abspath(f"{prod_area}/{parent.fullname}/submit") try: os.rmdir(submit_path) except Exception: # pylint: disable=broad-exception-caught @@ -226,7 +226,7 @@ async def _check_htcondor_job( htcondor_status = await ScriptHandler._check_htcondor_job(self, session, htcondor_id, script, parent) if htcondor_status == StatusEnum.accepted: await script.update_values(session, status=StatusEnum.accepted) - wms_job_id = os.path.join(os.path.dirname(script.log_url, "submit")) + wms_job_id = os.path.join(os.path.dirname(script.log_url), "submit") await parent.update_values(session, wms_job_id=wms_job_id) return htcondor_status