SOURCES: apport-rpm-deps.patch (NEW), apport-rpm-platform.patch (N...
patrys
patrys at pld-linux.org
Sun Apr 6 21:58:09 CEST 2008
Author: patrys Date: Sun Apr 6 19:58:09 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix rpm behavior
---- Files affected:
SOURCES:
apport-rpm-deps.patch (NONE -> 1.1) (NEW), apport-rpm-platform.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/apport-rpm-deps.patch
diff -u /dev/null SOURCES/apport-rpm-deps.patch:1.1
--- /dev/null Sun Apr 6 21:58:09 2008
+++ SOURCES/apport-rpm-deps.patch Sun Apr 6 21:58:04 2008
@@ -0,0 +1,11 @@
+--- ubuntu/backends/packaging_rpm.py~ 2008-04-06 21:05:21.000000000 +0200
++++ ubuntu/backends/packaging_rpm.py 2008-04-06 21:15:26.310825923 +0200
+@@ -52,7 +52,7 @@
+ # parse this package's Requires
+ reqs=[]
+ for r in hdr['requires']:
+- if r.startswith('rpmlib'):
++ if r.startswith('rpmlib') or r.startswith('uname('):
+ continue # we've got rpmlib, thanks
+ if r[0] == '/': # file requires
+ req_heads = self._get_headers_by_tag('basenames',r)
================================================================
Index: SOURCES/apport-rpm-platform.patch
diff -u /dev/null SOURCES/apport-rpm-platform.patch:1.1
--- /dev/null Sun Apr 6 21:58:09 2008
+++ SOURCES/apport-rpm-platform.patch Sun Apr 6 21:58:04 2008
@@ -0,0 +1,11 @@
+--- ubuntu/backends/packaging_rpm.py~ 2007-07-14 16:59:17.000000000 +0200
++++ ubuntu/backends/packaging_rpm.py 2008-04-06 20:39:31.675388970 +0200
+@@ -145,6 +145,8 @@
+ # XXX is there an rpmlib method for this?
+ f = open('/etc/rpm/platform')
+ line = f.readline()
++ while line == '' or line[0] == '#':
++ line = f.readline()
+ f.close()
+ (arch,vendor,os) = line.split('-')
+ return arch
================================================================
More information about the pld-cvs-commit
mailing list