Skip to content

Commit cd67daf

Browse files
authored
Merge pull request #7144 from DIRACGridBot/cherry-pick-2-08451d457-integration
[sweep:integration] dirac_production_runjoblocal fix
2 parents 1ce2827 + 142094e commit cd67daf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/DIRAC/TransformationSystem/scripts/dirac_production_runjoblocal.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ def __downloadPilotScripts():
6363
"dirac-pilot.py",
6464
"pilotCommands.py",
6565
"pilotTools",
66-
"MessageSender",
67-
"PilotLogger.py",
68-
"PilotLoggerTools.py",
6966
]:
7067
remoteFile = urlopen(
7168
os.path.join("https://raw.githubusercontent.com/DIRACGrid/Pilot/master/Pilot/", fileName),
@@ -95,7 +92,7 @@ def __configurePilot(basepath, vo):
9592
diracdir = os.path.expanduser("~") + os.path.sep
9693
try:
9794
os.rename(diracdir + ".dirac.cfg", diracdir + ".dirac.cfg.old")
98-
except OSError:
95+
except (OSError, FileNotFoundError):
9996
pass
10097
shutil.copyfile(diracdir + "pilot.cfg", diracdir + ".dirac.cfg")
10198

@@ -146,7 +143,10 @@ def main():
146143
__runJobLocally(_jobID, _path, _vo)
147144
finally:
148145
os.chdir(_dir)
149-
os.rename(_dir + ".dirac.cfg.old", _dir + ".dirac.cfg")
146+
try:
147+
os.rename(_dir + ".dirac.cfg.old", _dir + ".dirac.cfg")
148+
except FileNotFoundError:
149+
pass
150150

151151

152152
if __name__ == "__main__":

0 commit comments

Comments
 (0)