pstodulk pushed to preupgrade-assistant (master). "fix wrong substition for solution texts"

[notifications at fedoraproject.org]

From c9cd2b54d04a26b7186913372de179437e9ba45e Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk at redhat.com>
Date: Wed, 20 May 2015 09:15:56 +0200
Subject: fix wrong substition for solution texts


diff --git a/preupgrade-assistant-html.patch b/preupgrade-assistant-html.patch
new file mode 100644
index 0000000..fb7c74e
--- /dev/null
+++ b/preupgrade-assistant-html.patch
@@ -0,0 +1,13 @@
+diff --git a/preup/xml_manager.py b/preup/xml_manager.py
+index 21798db..1102a71 100644
+--- a/preup/xml_manager.py
++++ b/preup/xml_manager.py
+@@ -255,8 +255,6 @@ class XmlManager(object):
+             section = dir_name.replace(os.path.join(self.dirname, self.scenario),
+                                        "").replace("/", "_")
+             solution_text = section + "_SOLUTION_MSG"
+-            if extension == "html":
+-                solution_text = "<p>" + solution_text
+             file_name = self._return_correct_text_file(section, files)
+             if not file_name or file_name is None:
+                 continue
diff --git a/preupgrade-assistant.spec b/preupgrade-assistant.spec
index 3b199b6..2fe4b6e 100644
--- a/preupgrade-assistant.spec
+++ b/preupgrade-assistant.spec
@@ -4,7 +4,7 @@
 
 Name:           preupgrade-assistant
 Version:        0.11.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Preupgrade assistant performs assessment of the system
 License:        GPLv3+
 URL:            https://github.com/phracek/preupgrade-assistant
@@ -12,6 +12,7 @@ Source0:        https://github.com/phracek/%{name}/archive/%{pa_version}.tar.gz
 Source1:        macros.preupgrade-assistant
 Patch0:         preupgrade-assistant-do-not-ship-ui.patch
 Patch1:         preupgrade-assistant-reports.patch
+Patch2:         preupgrade-assistant-html.patch
 BuildArch:      noarch
 
 BuildRequires:  rpm-devel
@@ -77,6 +78,7 @@ and scripts for generating contents.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .not-ui
 %patch1 -p1 -b .reports
+%patch2 -p1 -b .html_patch
 
 rm -rf preup_ui
 rm -rf ui-conf
@@ -165,6 +167,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/premigrate
 %{_rpmconfigdir}/macros.d/macros.preupgrade-assistant
 
 %changelog
+* Wed May 20 2015 Petr Stodulka <pstodulk at redhat.com> - 0.11.12-3
+- fixed wrong substitution for solution texts
+
 * Tue May 19 2015 Petr Stodulka <pstodulk at redhat.com> - 0.11.12-2
 - added patch for updating solution.txt caused by splitting reports 
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/preupgrade-assistant.git/commit/?h=master&id=c9cd2b54d04a26b7186913372de179437e9ba45e