support Preupgrade Assistant 2.2.0

- bump version

Author: bocekm

redhat-upgrade-tool.py

@@ -42,8 +42,8 @@
 import redhat_upgrade_tool.logutils as logutils
 import redhat_upgrade_tool.media as media
 
-from preup.xccdf import XccdfHelper
-from preup import settings
+from preupg.xccdf import XccdfHelper
+from preupg import settings
 
 import logging
 log = logging.getLogger("redhat-upgrade-tool")
@@ -106,7 +106,8 @@ def reboot():
     call(['reboot'])
 
 def get_preupgrade_result_name():
-    return os.path.join(settings.result_dir, settings.xml_result_name)
+    return os.path.join(settings.assessment_results_dir,
+                        settings.xml_result_name)
 
 def check_release_version_file():
     if not os.path.exists(release_version_file):

redhat-upgrade-tool.spec

@@ -1,5 +1,5 @@
 Name:           redhat-upgrade-tool
-Version:        0.7.47
+Version:        0.7.48
 Release:        1%{?dist}
 Summary:        The Red Hat Enterprise Linux Upgrade tool
 Epoch:          1
@@ -10,9 +10,7 @@ Source0:        %{url}/archive/%{name}-%{version}.tar.gz
 
 Requires:       grubby
 Requires:       python-rhsm
-
-# Require for preupgr --riskcheck
-Requires:       preupgrade-assistant >= 2.1.8-1
+Requires:       preupgrade-assistant >= 2.2.0-1
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1038299
 Requires:       yum >= 3.2.29-43
@@ -75,6 +73,12 @@ mkdir -p $RPM_BUILD_ROOT/etc/redhat-upgrade-tool/update.img.d
 #{_datadir}/redhat-upgrade-tool/ui
 
 %changelog
+* Mon Dec 5 2016 Michal Bocek <[email protected]> - 1:0.7.48-1
+- Support Preupgrade Assistant version 2.2.0
+  Resolves: rhbz#1398401
+- Fix usage of HTTPS repo URL with --noverify option
+  Resolves: rhbz#1398318
+
 * Thu Oct 6 2016 Michal Bocek <[email protected]> - 1:0.7.47-1
 - Fix traceback caused by Unicode characters that appear in raw_input
   prompt message during the import of GPG keys.

setup.py

@@ -64,7 +64,7 @@ def run(self):
                 os.rename(outfile, newfile)
 
 setup(name="redhat-upgrade-tool",
-      version="0.7.47",
+      version="0.7.48",
       description="Red Hat Upgrade",
       long_description="",
       author="Will Woods",