saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Check for exc existence before using

Browse source
This commit is contained in:
Twangboy 2025-01-15 09:54:14 -07:00 • committed by Daniel Wozniak
parent 65ba161cd8
commit a7806bc91a
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
salt/modules/archive.py
View file

@ -834,18 +834,19 @@ def zip_(zip_file, sources, template=None, cwd=None, runas=None, zip64=False):
if runas:
os.seteuid(euid)
os.setegid(egid)
if exc is not None:
# Wait to raise the exception until euid/egid are restored to avoid
# permission errors in writing to minion log.
if exc == zipfile.LargeZipFile:
raise CommandExecutionError(
"Resulting zip file too large, would require ZIP64 support"
"which has not been enabled. Rerun command with zip64=True"
)
else:
raise CommandExecutionError(
f"Exception encountered creating zipfile: {exc}"
)
if "exc" in vars() or "exc" in globals():
if exc is not None:
# Wait to raise the exception until euid/egid are restored to avoid
# permission errors in writing to minion log.
if exc == zipfile.LargeZipFile:
raise CommandExecutionError(
"Resulting zip file too large, would require ZIP64 support"
"which has not been enabled. Rerun command with zip64=True"
)
else:
raise CommandExecutionError(
f"Exception encountered creating zipfile: {exc}"
)
return archived_files