[packages/rpm] - fix the syntax of the python initialization code that resulted in neither the output redirection

baggins baggins at pld-linux.org
Tue Aug 13 20:16:44 CEST 2013


commit 846d6870a80fdb6c79d9710b78d2267087e924c3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 13 20:08:01 2013 +0200

    - fix the syntax of the python initialization code that resulted in
      neither the output redirection working nor the rpm python module being loaded

 rpm-5.4.12-fix-rpmpython-module-import-init.patch | 15 +++++++++++++++
 rpm.spec                                          |  2 ++
 2 files changed, 17 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 6763d70..68db431 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -269,6 +269,7 @@ Patch1042:	%{name}-5.4.9-fix-rpm_qa-pattern.patch
 # warning: introduces memory leak
 Patch1043:	%{name}-5.4.12-copy-Value-string.patch
 Patch1044:	%{name}-5.4.12-fix-rpmlua-print.patch
+Patch1045:	%{name}-5.4.12-fix-rpmpython-module-import-init.patch
 
 URL:		http://rpm5.org/
 BuildRequires:	%{reqdb_pkg}-devel >= %{reqdb_pkgver}
@@ -943,6 +944,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1042 -p1
 %patch1043 -p1
 %patch1044 -p1
+%patch1045 -p1
 %patch68 -p1
 %patch69 -p1
 
diff --git a/rpm-5.4.12-fix-rpmpython-module-import-init.patch b/rpm-5.4.12-fix-rpmpython-module-import-init.patch
new file mode 100644
index 0000000..fb4c0df
--- /dev/null
+++ b/rpm-5.4.12-fix-rpmpython-module-import-init.patch
@@ -0,0 +1,15 @@
+--- rpm-5.4.12/rpmio/rpmpython.c.modload~	2013-08-08 21:39:28.605164699 +0200
++++ rpm-5.4.12/rpmio/rpmpython.c	2013-08-08 21:39:10.913948618 +0200
+@@ -66,9 +66,9 @@ static rpmpython rpmpythonGetPool(/*@nul
+ /*@unchecked@*/
+ #if defined(MODULE_EMBED)
+ static const char * _rpmpythonI_init = "\
+-import sys\n\
+-from cStringIO import StringIO\n\
+-sys.stdout = StringIO()\n\
++import sys;\
++from cStringIO import StringIO;\
++sys.stdout = StringIO();\
+ ";
+ #endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/f12f8a526cb287a152637d49fc4faa6d41ae3a14



More information about the pld-cvs-commit mailing list