Fixed rhbz #1325393

Signed-off-by: Petr Hracek <phracek@redhat.com>
upgrades-migrations · Jun 13, 2016 · 7914abc · 7914abc
1 parent 9c09ba0
commit 7914abc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/preup/application.py b/preup/application.py
@@ -431,7 +431,7 @@ def scan_system(self):
         assessment_dir = self.generate_report()
         # Update source XML file in temporary directory
         self.content = os.path.join(assessment_dir, settings.content_file)
-        self.openscap_helper = OpenSCAPHelper(self.conf.result_dir,
+        self.openscap_helper.update_variables(self.conf.result_dir,
                                               self.conf.result_name,
                                               self.conf.xml_result_name,
                                               self.conf.html_result_name,
@@ -603,8 +603,17 @@ def run(self):
             self.clean_preupgrade_environment()
             sys.exit(0)
 
+        self.openscap_helper = OpenSCAPHelper(self.conf.result_dir,
+                                              self.conf.result_name,
+                                              self.conf.xml_result_name,
+                                              self.conf.html_result_name,
+                                              self.content)
         if self.conf.riskcheck:
-            return_val = XccdfHelper.check_inplace_risk(OpenSCAPHelper.get_default_xml_result_path(), self.conf.verbose)
+            if not os.path.exists(self.openscap_helper.get_default_xml_result_path()):
+                log_message("'preupg' command was not run yet. Run them before checking risks.")
+                return 14
+            return_val = XccdfHelper.check_inplace_risk(self.openscap_helper.get_default_xml_result_path(),
+                                                        self.conf.verbose)
             return return_val
 
         if self.conf.kickstart:

diff --git a/preup/utils.py b/preup/utils.py
@@ -739,6 +739,14 @@ def __init__(self, result_dir, result_name, xml_result_name, html_result_name, c
         self.result_name = result_name
         self.content = content
 
+    def update_variables(self, result_dir, result_name, xml_result_name, html_result_name, content, third_party=None):
+        self.result_dir = result_dir
+        self.third_party = third_party
+        self.xml_result_name = xml_result_name
+        self.html_result_name = html_result_name
+        self.result_name = result_name
+        self.content = content
+
     @staticmethod
     def get_xsl_stylesheet():
         """Return full XSL stylesheet path"""