rpms/rpm/devel rpm-4.8.0-psdriver-more-fixes.patch, NONE, 1.1 rpm.spec, 1.383, 1.384

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6824

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.8.0-psdriver-more-fixes.patch 
Log Message:
- more fixes to postscript provides extractor (#562228)


rpm-4.8.0-psdriver-more-fixes.patch:
 postscriptdriver.prov |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE rpm-4.8.0-psdriver-more-fixes.patch ---
--- rpm-4.8.0/scripts/postscriptdriver.prov	2010-02-05 15:40:34.451050057 +0000
+++ rpm-4.8.0/scripts/postscriptdriver.prov~	2010-02-05 15:44:10.141926520 +0000
@@ -196,9 +196,15 @@ class DrvDriver(PPDDriver):
                  self.drv ]
 
         signal.alarm (60)
-        p = subprocess.Popen (argv,
-                              stdout=subprocess.PIPE,
-                              stderr=subprocess.PIPE)
+        try:
+            p = subprocess.Popen (argv,
+                                  stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE)
+        except OSError:
+            # ppdc not available.
+            os.rmdir (outputdir)
+            return Driver.list (self)
+
         try:
             (stdout, stderr) = p.communicate ()
             signal.alarm (0)
@@ -230,7 +236,7 @@ class TagBuilder:
                     self.ids += DynamicDriver (path).list ()
                 except TimedOut:
                     pass
-                except OSError, e:
+                except OSError, (e, s):
                     if e == errno.EACCES or e == errno.ENOENT:
                         # Not executable
                         pass


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- rpm.spec	5 Feb 2010 12:59:00 -0000	1.383
+++ rpm.spec	6 Feb 2010 10:00:27 -0000	1.384
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -39,6 +39,7 @@ Patch3: rpm-4.7.90-fedora-specspo.patch
 # TODO: merge these when things stabilize
 Patch4: rpm-4.8.0-psdriver.patch
 Patch5: rpm-4.8.0-psdriver-fixes.patch
+Patch6: rpm-4.8.0-psdriver-more-fixes.patch
 
 # Patches already in upstream
 Patch200: rpm-4.8.0-url-segfault.patch
@@ -190,6 +191,7 @@ packages on a system.
 %patch3 -p1 -b .fedora-specspo
 %patch4 -p1 -b .psdriver
 %patch5 -p1 -b .psdriver-fixes
+%patch6 -p1 -b .psdriver-more-fixes
 
 %patch200 -p1 -b .url-segfault
 %patch201 -p1 -b .verify-exitcode
@@ -411,6 +413,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Feb 05 2010 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-8
+- more fixes to postscript provides extractor (#562228)
+
 * Fri Feb 05 2010 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-7
 - couple of fixes to the postscript provides extractor (#538101)