From 70486ca1d4a328402fc5ca8ccc36d96727320300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Mon, 23 Jan 2023 13:27:37 +0000 Subject: [PATCH] Return error if there is a problem uploading openscap results to master --- salt/modules/openscap.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/salt/modules/openscap.py b/salt/modules/openscap.py index 721d61d13a6..a6ff75d530e 100644 --- a/salt/modules/openscap.py +++ b/salt/modules/openscap.py @@ -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