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

Return error if there is a problem uploading openscap results to master

Browse source
This commit is contained in:
Pablo Suárez Hernández 2023-01-23 13:27:37 +00:00 • committed by Megan Wilhite
parent b87c24ebeb
commit 70486ca1d4
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/openscap.py
View file

@ -175,7 +175,9 @@ def xccdf_eval(
error += "\nKilled by signal {}\n".format(proc.returncode).encode("ascii")
returncode = proc.returncode
if success:
__salt__["cp.push_dir"](tempdir)
if not __salt__["cp.push_dir"](tempdir):
success = False
error = "There was an error uploading openscap results files to salt master. Please check logs."
upload_dir = tempdir
shutil.rmtree(tempdir, ignore_errors=True)
@ -230,7 +232,9 @@ def xccdf(params):
error += "\nKilled by signal {}\n".format(proc.returncode).encode("ascii")
returncode = proc.returncode
if success:
__salt__["cp.push_dir"](tempdir)
if not __salt__["cp.push_dir"](tempdir):
success = False
error = "There was an error uploading openscap results files to salt master. Please check logs."
shutil.rmtree(tempdir, ignore_errors=True)
upload_dir = tempdir