phracek pushed to preupgrade-assistant (f22). "New upstream source 0.11.12 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri May 15 12:34:21 UTC 2015
From 7f9543a22e6ff57ceb25d36ea37df4254cbf0692 Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek at redhat.com>
Date: Fri, 15 May 2015 13:58:52 +0200
Subject: New upstream source 0.11.12
Signed-off-by: Petr Hracek <phracek at redhat.com>
diff --git a/.gitignore b/.gitignore
index 0e7832a..084dd5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/0.11.7.tar.gz
/0.11.10.tar.gz
+/0.11.12.tar.gz
diff --git a/preupgrade-assistant-do-not-ship-ui.patch b/preupgrade-assistant-do-not-ship-ui.patch
index 640b43f..7a548d0 100644
--- a/preupgrade-assistant-do-not-ship-ui.patch
+++ b/preupgrade-assistant-do-not-ship-ui.patch
@@ -14,25 +14,27 @@ index e497efb..dc0cfae 100644
-recursive-include preup_ui/templates *
-recursive-include preup_ui/lib *
diff --git a/preup/application.py b/preup/application.py
-index 4ab00e4..2139cbd 100644
+index adb1836..6549837 100644
--- a/preup/application.py
+++ b/preup/application.py
-@@ -4,7 +4,6 @@ The application module serves for running oscap binary and reporting results to
- """
- import shutil
- import datetime
--from xmlrpclib import Fault
+@@ -11,11 +11,6 @@ import sys
+ import six
from distutils import dir_util
- from preup import xccdf, xml_manager, remediate, utils
-@@ -26,16 +25,6 @@ def get_xsl_stylesheet():
+-try:
+- from xmlrpclib import Fault
+-except ImportError:
+- from xmlrpc.client import Fault
+-
+ from preup import xccdf, xml_manager, remediate, utils, settings
+ from preup.common import Common
+ from preup.scanning import ScanProgress, format_rules_to_table
+@@ -33,14 +28,6 @@ def get_xsl_stylesheet():
return os.path.join(settings.share_dir, "preupgrade", "xsl", settings.xsl_sheet)
-def fault_repr(self):
-- """
-- monkey patching Fault's repr method so newlines are actually interpreted
-- """
+- """monkey patching Fault's repr method so newlines are actually interpreted"""
- log_message(self.faultString)
- return "<Fault %s: %s>" % (self.faultCode, self.faultString)
-
@@ -40,14 +42,14 @@ index 4ab00e4..2139cbd 100644
-
-
def list_contents(source_dir):
- """
- Function returns a list of installed contents
-@@ -190,57 +179,6 @@ class Application(object):
+ """Function returns a list of installed contents"""
+ content_dict = {}
+@@ -175,57 +162,6 @@ class Application(object):
command.append(check_xml(self.content))
return command
- def upload_results(self, tarball_path=None):
-- """ upload tarball with results to frontend """
+- """upload tarball with results to frontend"""
- import xmlrpclib
- import socket
- if self.conf.upload is True:
@@ -98,26 +100,26 @@ index 4ab00e4..2139cbd 100644
- log_message("Report submit: %s" % status, level=logging.ERROR)
-
def apply_scan(self):
- """ Extract tar ball for remediation """
+ """Extract tar ball for remediation"""
self.prepare_apply_directories()
-@@ -721,8 +659,6 @@ If you would like to use this tool, you have to have only one." % settings.sourc
+@@ -670,8 +606,6 @@ If you would like to use this tool, you have to have only one." % settings.sourc
self.summary_report()
self.common.copy_common_files()
utils.remove_home_issues()
- if self.conf.upload:
- self.upload_results(tarball_path)
os.chdir(current_dir)
- #self.post_scan()
return 0
+
diff --git a/preup/cli.py b/preup/cli.py
-index 75fdea2..925d066 100644
+index 06f82fc..0fad068 100644
--- a/preup/cli.py
+++ b/preup/cli.py
@@ -8,23 +8,6 @@ from optparse import OptionValueError
from preup.constants import *
--def upload_callback(option, opt_str, value, parser):
+-def upload_callback(option, dummy_opt_str, dummy_value, parser):
- if len(parser.rargs) == 0:
- setattr(parser.values, option.dest, True)
- else:
@@ -135,9 +137,9 @@ index 75fdea2..925d066 100644
-
-
class CLI(object):
- """ Class for processing data from commandline """
-@@ -52,17 +35,6 @@ class CLI(object):
+ """Class for processing data from commandline"""
+@@ -53,17 +36,6 @@ class CLI(object):
help="Turn on debugging mode"
)
self.parser.add_option(
@@ -177,7 +179,7 @@ index e683585..7e9db33 100755
except Exception as ex:
cli.parser.error(str(ex))
diff --git a/setup.py b/setup.py
-index 0cd43bf..c46ebff 100755
+index 8a81d32..b6d8bb8 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from scripts.include import *
@@ -191,11 +193,11 @@ index 0cd43bf..c46ebff 100755
project_author_email = "phracek at redhat.com"
@@ -18,10 +18,9 @@ package_name = "%s" % project_name
package_module_name = project_name
- package_version = "0.11.8"
-
+ package_version = "0.11.12"
+
-script_files = ['preupg', 'premigrate', 'preupg-xccdf-compose', 'preupg-create-group-xml', 'preup_ui_manage']
+script_files = ['preupg', 'premigrate', 'preupg-xccdf-compose', 'preupg-create-group-xml']
-
+
data_files = {
- 'preup_ui/report/fixtures/': ['preup_ui/report/fixtures/initial_data.json'],
'preuputils/': ['preuputils/template.xml'],
@@ -214,20 +216,3 @@ index 0cd43bf..c46ebff 100755
# override default tarball format with bzip2
distutils.command.sdist.sdist.default_format = {'posix': 'bztar'}
-diff --git a/tests/__init__.py b/tests/__init__.py
-index b8826e2..5db1b99 100644
---- a/tests/__init__.py
-+++ b/tests/__init__.py
-@@ -1,8 +1,8 @@
--import test_preup
--import test_xml
- import unittest
--import test_oscap
--import test_generation
-+from tests import test_preup
-+from tests import test_xml
-+from tests import test_oscap
-+from tests import test_generation
-
-
- def suite():
diff --git a/preupgrade-assistant.spec b/preupgrade-assistant.spec
index 11c9c57..00f1d3e 100644
--- a/preupgrade-assistant.spec
+++ b/preupgrade-assistant.spec
@@ -1,9 +1,9 @@
%{!?scl:%global pkg_name %{name}}
-%global pa_version 0.11.10
+%global pa_version 0.11.12
Name: preupgrade-assistant
-Version: 0.11.10
+Version: 0.11.12
Release: 1%{?dist}
Summary: Preupgrade assistant performs assessment of the system
License: GPLv3+
@@ -163,6 +163,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/premigrate
%{_rpmconfigdir}/macros.d/macros.preupgrade-assistant
%changelog
+* Fri May 15 2015 Petr Hracek <phracek at redhat.com> - 0.11.12-1
+- Rebase to new upstream version 0.11.12
+
* Fri Apr 10 2015 Petr Stodulka <pstodulk at redhat.com> - 0.11.10-1
- Rebase to new upstream version 0.11.10
- modified patch0
diff --git a/sources b/sources
index 7801628..a765e38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9d9501515f86ebc60103eed212a4f46 0.11.10.tar.gz
+3cb2b1442b401f46f1e5d214a69806fa 0.11.12.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/preupgrade-assistant.git/commit/?h=f22&id=7f9543a22e6ff57ceb25d36ea37df4254cbf0692
More information about the scm-commits
mailing list