From 6b08a4c01a2ac644b15a34dbbd664d360d2d34fb Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@fedoraproject.org>
Date: Feb 06 2010 10:00:27 +0000
Subject: - more fixes to postscript provides extractor (#562228)


---

diff --git a/rpm-4.8.0-psdriver-more-fixes.patch b/rpm-4.8.0-psdriver-more-fixes.patch
new file mode 100644
index 0000000..3572574
--- /dev/null
+++ b/rpm-4.8.0-psdriver-more-fixes.patch
@@ -0,0 +1,30 @@
+--- 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
diff --git a/rpm.spec b/rpm.spec
index 062aae0..5c81544 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -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@redhat.com> - 4.8.0-8
+- more fixes to postscript provides extractor (#562228)
+
 * Fri Feb 05 2010 Panu Matilainen <pmatilai@redhat.com> - 4.8.0-7
 - couple of fixes to the postscript provides extractor (#538101)