rpms/python-iniparse/devel iniparse.patch, NONE, 1.1 python-iniparse.spec, 1.16, 1.17

Tim Lauridsen timlau at fedoraproject.org
Mon Mar 2 12:15:57 UTC 2009


Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26998

Modified Files:
	python-iniparse.spec 
Added Files:
	iniparse.patch 
Log Message:
Release 0.3.0-2 : Added patch to fix upstream regrestion

iniparse.patch:

--- NEW FILE iniparse.patch ---
Index: iniparse/ini.py
===================================================================
--- iniparse/ini.py	(revision 111)
+++ iniparse/ini.py	(working copy)
@@ -404,7 +404,7 @@
 
 
 def make_comment(line):
-    return CommentLine(line.rstrip())
+    return CommentLine(line.rstrip('\n'))
 
 
 def readline_iterator(f):
@@ -578,11 +578,9 @@
 
             if isinstance(lineobj, OptionLine):
                 if pending_lines:
-                    cur_option.extend(pending_lines)
+                    cur_section.extend(pending_lines)
                     pending_lines = []
-                    if pending_empty_lines:
-                        optobj._compat_skip_empty_lines.add(cur_option_name)
-                        pending_empty_lines = False
+                    pending_empty_lines = False
                 cur_option = LineContainer(lineobj)
                 cur_section.add(cur_option)
                 if self._optionxform:


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-iniparse.spec	28 Feb 2009 11:06:51 -0000	1.16
+++ python-iniparse.spec	2 Mar 2009 12:15:26 -0000	1.17
@@ -2,12 +2,14 @@
 
 Name:           python-iniparse
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
+Patch0:         iniparse.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 8
@@ -27,7 +29,8 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-
+%patch0
+ 
 %build
 %{__python} setup.py build
 
@@ -51,6 +54,9 @@
 
 
 %changelog
+* Mon Mar 2 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.3.0-2
+- added patch from upstream to fix regrestion :
+
 * Sat Feb 28 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.3.0-1
 - Release 0.3.0
 -  Fix handling of continuation lines




More information about the fedora-extras-commits mailing list