rpms/deltarpm/devel deltarpm-python-error.patch, NONE, 1.1 deltarpm.spec, 1.26, 1.27

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv751

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-python-error.patch 
Log Message:
Fix rawhide deltarpm error (theoretically)


deltarpm-python-error.patch:
 deltarpmmodule.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE deltarpm-python-error.patch ---
diff -up deltarpm-git-20090831.1/deltarpmmodule.c.foo deltarpm-git-20090831.1/deltarpmmodule.c
--- deltarpm-git-20090831.1/deltarpmmodule.c.foo	2009-09-09 13:28:37.000000000 -0400
+++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 13:29:07.000000000 -0400
@@ -66,13 +66,17 @@ static PyObject *doRead(PyObject *s, PyO
   int pid;
   int ipcpipe[2];
   
-  if (!PyArg_ParseTuple(args, "s", &filename))
+  if (!PyArg_ParseTuple(args, "s", &filename)) {
+    PyErr_SetFromErrno(PyExc_SystemError);
     return NULL;
+  }
 
   /* The delta rpm code does not expect to be used in its way. Its error handling
    * conststs of 'printf' and 'exit'. So, dirty hacks abound. */
-  if (pipe2(ipcpipe, O_NONBLOCK) == -1)
+  if (pipe2(ipcpipe, O_NONBLOCK) == -1) {
+    PyErr_SetFromErrno(PyExc_SystemError);
     return NULL;
+  }
 
   if ((pid = fork())) {
     FILE *readend = fdopen(ipcpipe[0], "r");


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- deltarpm.spec	31 Aug 2009 14:26:03 -0000	1.26
+++ deltarpm.spec	9 Sep 2009 17:48:28 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1%{?dist}
+Release: 0.git.20090831.1.1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -13,6 +13,7 @@ URL: http://gitorious.org/deltarpm/delta
 # git archive --format=tar --prefix="deltarpm-git-20090831.1/" a3c6998 | \
 # bzip2 > deltarpm-git-20090831.1.tar.bz2
 Source: %{name}-git-20090831.1.tar.bz2
+Patch: deltarpm-python-error.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
@@ -50,6 +51,7 @@ This package contains python bindings fo
 
 %prep
 %setup -q -n %{name}-git-20090831.1
+%patch -p1
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -96,6 +98,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.1
+- fix python bindings
+
 * Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831.1
 - Add python bindings sub-package
 - Fix build error