[41577] trunk/dports/sysutils/yum

afb at macports.org afb at macports.org
Thu Nov 6 03:21:02 PST 2008


Revision: 41577
          http://trac.macports.org/changeset/41577
Author:   afb at macports.org
Date:     2008-11-06 03:21:00 -0800 (Thu, 06 Nov 2008)
Log Message:
-----------
check for rpm.RPMSENSE_PREREQ existance before using

Modified Paths:
--------------
    trunk/dports/sysutils/yum/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/yum/files/patch-packages.py

Modified: trunk/dports/sysutils/yum/Portfile
===================================================================
--- trunk/dports/sysutils/yum/Portfile	2008-11-06 11:04:47 UTC (rev 41576)
+++ trunk/dports/sysutils/yum/Portfile	2008-11-06 11:21:00 UTC (rev 41577)
@@ -4,6 +4,7 @@
 
 name		yum
 version		3.2.20
+revision	1
 platforms	darwin
 categories	sysutils archivers
 maintainers	n3npq at mac.com afb at macports.org
@@ -20,7 +21,7 @@
 		sha1 65fde6524d086df63c4ec87cd63c9461b9c0a17f \
 		rmd160 95932ba98be4998724f45528e3d02a4fa566726c
 
-patchfiles	patch-prefix.diff patch-sqlutils.py
+patchfiles	patch-prefix.diff patch-sqlutils.py patch-packages.py
 
 depends_lib	lib:librpm:rpm port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
 

Added: trunk/dports/sysutils/yum/files/patch-packages.py
===================================================================
--- trunk/dports/sysutils/yum/files/patch-packages.py	                        (rev 0)
+++ trunk/dports/sysutils/yum/files/patch-packages.py	2008-11-06 11:21:00 UTC (rev 41577)
@@ -0,0 +1,11 @@
+--- yum/packages.py.orig	2008-11-06 11:57:14.000000000 +0100
++++ yum/packages.py	2008-11-06 12:09:20.000000000 +0100
+@@ -1121,6 +1121,8 @@ class YumHeaderPackage(YumAvailablePacka
+         # - that's what it is
+         newflag = flag
+         if flag is not None:
++            if not hasattr(rpm, 'RPMSENSE_PREREQ'):
++                return 0
+             newflag = flag & rpm.RPMSENSE_PREREQ
+             if newflag == rpm.RPMSENSE_PREREQ:
+                 return 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081106/ebb6ec69/attachment.html>


More information about the macports-changes mailing list