SOURCES: yum-chroot.patch, yum-missingok.patch - 3.2.11 - missingo...
patrys
patrys at pld-linux.org
Tue Feb 12 12:49:31 CET 2008
Author: patrys Date: Tue Feb 12 11:49:31 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- 3.2.11
- missingok less intrusive, just installs all optional deps
---- Files affected:
SOURCES:
yum-chroot.patch (1.5 -> 1.6) , yum-missingok.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/yum-chroot.patch
diff -u SOURCES/yum-chroot.patch:1.5 SOURCES/yum-chroot.patch:1.6
--- SOURCES/yum-chroot.patch:1.5 Wed Dec 26 17:27:20 2007
+++ SOURCES/yum-chroot.patch Tue Feb 12 12:49:26 2008
@@ -148,11 +148,11 @@
else:
root = '/'
@@ -1231,7 +1232,7 @@ class YumOptionParser(OptionParser):
- help="be tolerant of errors")
+ help=_("be tolerant of errors"))
self.add_option("-C", dest="cacheonly", action="store_true",
- help="run entirely from cache, don't update cache")
+ help=_("run entirely from cache, don't update cache"))
- self.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
+ self.add_option("-c", dest="conffile", default=None,
- help="config file location", metavar=' [config file]')
+ help=_("config file location"), metavar=' [config file]')
self.add_option("-R", dest="sleeptime", type='int', default=None,
- help="maximum command wait time", metavar=' [minutes]')
+ help=_("maximum command wait time"), metavar=' [minutes]')
================================================================
Index: SOURCES/yum-missingok.patch
diff -u SOURCES/yum-missingok.patch:1.4 SOURCES/yum-missingok.patch:1.5
--- SOURCES/yum-missingok.patch:1.4 Wed Jan 9 19:27:34 2008
+++ SOURCES/yum-missingok.patch Tue Feb 12 12:49:26 2008
@@ -1,16 +1,3 @@
-diff -ur yum-3.2.0/output.py yum-3.2.0-new/output.py
---- yum-3.2.0/output.py 2007-01-21 21:21:37.000000000 +0100
-+++ yum-3.2.0-new/output.py 2007-05-26 21:06:18.981804315 +0200
-@@ -268,6 +268,9 @@
- appended = ' replacing %s.%s %s\n\n' % (obspo.name,
- obspo.arch, obspo.printVer())
- msg = msg+appended
-+ for sug in txmbr.po.prco['suggests']:
-+ appended = ' suggests %s\n\n' % prco_tuple_to_string(sug)
-+ msg = msg+appended
- totalmsg = totalmsg + msg
-
- if pkglist:
diff -ur yum-3.2.0/rpmUtils/miscutils.py yum-3.2.0-new/rpmUtils/miscutils.py
--- yum-3.2.0/rpmUtils/miscutils.py 2007-04-08 05:56:54.000000000 +0200
+++ yum-3.2.0-new/rpmUtils/miscutils.py 2007-05-26 21:06:18.961805690 +0200
@@ -26,89 +13,26 @@
diff -ur yum-3.2.0/yum/packages.py yum-3.2.0-new/yum/packages.py
--- yum-3.2.0/yum/packages.py 2007-04-26 00:19:28.000000000 +0200
+++ yum-3.2.0-new/yum/packages.py 2007-05-26 21:06:18.951806377 +0200
-@@ -183,6 +183,8 @@
-
- def __init__(self):
- self.prco = {}
-+ self.prco['suggests'] = [] # (name, flag, (e,v,r))
-+ self.prco['enhances'] = [] # (name, flag, (e,v,r))
- self.prco['obsoletes'] = [] # (name, flag, (e,v,r))
- self.prco['conflicts'] = [] # (name, flag, (e,v,r))
- self.prco['requires'] = [] # (name, flag, (e,v,r))
-@@ -677,7 +679,6 @@
-
- def _populatePrco(self):
- "Populate the package object with the needed PRCO interface."
--
- tag2prco = { "OBSOLETE": "obsoletes",
- "CONFLICT": "conflicts",
- "REQUIRE": "requires",
-@@ -685,8 +686,8 @@
- for tag in tag2prco.keys():
- name = self.hdr[getattr(rpm, 'RPMTAG_%sNAME' % tag)]
-
-- lst = self.hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)]
-- flag = map(rpmUtils.miscutils.flagToString, lst)
-+ flg = self.hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)]
-+ flag = map(rpmUtils.miscutils.flagToString, flg)
-
- lst = self.hdr[getattr(rpm, 'RPMTAG_%sVERSION' % tag)]
- vers = map(rpmUtils.miscutils.stringToVersion, lst)
-@@ -694,6 +695,15 @@
+@@ -694,6 +695,11 @@
prcotype = tag2prco[tag]
if name is not None:
self.prco[prcotype] = zip(name, flag, vers)
-+ if prcotype in ('requires', 'provides'):
-+ for dep in self.prco[prcotype]:
-+ if type(dep[1]) is tuple and dep[1][0] == 'MISSINGOK':
-+ self.prco[prcotype].remove(dep)
-+ dep = (dep[0], dep[1][1], dep[2])
-+ if prcotype == 'requires':
-+ self.prco['suggests'].append(dep)
-+ else:
-+ self.prco['enhances'].append(dep)
++ for dep in self.prco[prcotype]:
++ if type(dep[1]) is tuple and dep[1][0] == 'MISSINGOK':
++ self.prco[prcotype].remove(dep)
++ dep = (dep[0], dep[1][1], dep[2])
++ self.prco[prcotype].append(dep)
def tagByName(self, tag):
warnings.warn("tagByName() will go away in a furture version of Yum.\n",
-diff -ur yum-3.2.0/yum/rpmsack.py yum-3.2.0-new/yum/rpmsack.py
---- yum-3.2.0/yum/rpmsack.py 2007-04-27 15:16:12.000000000 +0200
-+++ yum-3.2.0-new/yum/rpmsack.py 2007-05-26 21:06:18.908476022 +0200
-@@ -41,7 +41,13 @@
- rpm.RPMTAG_CONFLICTFLAGS),
- 'obsoletes' : (rpm.RPMTAG_OBSOLETENAME,
- rpm.RPMTAG_OBSOLETEVERSION,
-- rpm.RPMTAG_OBSOLETEFLAGS)
-+ rpm.RPMTAG_OBSOLETEFLAGS),
-+ 'enhances' : (rpm.RPMTAG_ENHANCESNAME,
-+ rpm.RPMTAG_ENHANCESVERSION,
-+ rpm.RPMTAG_ENHANCESFLAGS),
-+ 'suggests' : (rpm.RPMTAG_SUGGESTSNAME,
-+ rpm.RPMTAG_SUGGESTSVERSION,
-+ rpm.RPMTAG_SUGGESTSFLAGS)
- }
-
- def __init__(self, root='/'):
diff -ur yum-3.2.0/yum/sqlitesack.py yum-3.2.0-new/yum/sqlitesack.py
--- yum-3.2.0/yum/sqlitesack.py 2007-04-25 20:55:36.000000000 +0200
+++ yum-3.2.0-new/yum/sqlitesack.py 2007-05-26 21:06:18.951806377 +0200
-@@ -38,7 +38,9 @@
- self.prco = { 'obsoletes': (),
- 'conflicts': (),
- 'requires': (),
-- 'provides': () }
-+ 'provides': (),
-+ 'suggests': (),
-+ 'enhances': () }
- self._files = {}
- self.sack = repo.sack
- self.repoid = repo.id
-@@ -189,9 +191,30 @@
+@@ -189,5 +191,13 @@
executeSQL(cur, query)
self.prco[prcotype] = [ ]
for ob in cur:
-- self.prco[prcotype].append((ob['name'], ob['flags'],
-- (ob['epoch'], ob['version'],
-- ob['release'])))
+- prco_set = (ob['name'], ob['flags'],
+ fl = ob['flags']
+ if fl:
+ fl = fl.split(',')
@@ -117,22 +41,7 @@
+ flags = ','.join(fl)
+ if not flags:
+ flags = None
-+ if prcotype == 'requires':
-+ self.prco['suggests'].append((ob['name'], flags,
-+ (ob['epoch'], ob['version'],
-+ ob['release'])))
-+ elif prcotype == 'provides':
-+ self.prco['enhances'].append((ob['name'], flags,
-+ (ob['epoch'], ob['version'],
-+ ob['release'])))
-+ else:
-+ self.prco[prcotype].append((ob['name'], ob['flags'],
-+ (ob['epoch'], ob['version'],
-+ ob['release'])))
-+ else:
-+ self.prco[prcotype].append((ob['name'], ob['flags'],
-+ (ob['epoch'], ob['version'],
-+ ob['release'])))
-
- return RpmBase.returnPrco(self, prcotype, printable)
-
++ prco_set = (ob['name'], flags,
+ (ob['epoch'], ob['version'], ob['release']))
+ # This saves memory by merging the prco data from multiple
+ # packages. Note that flags etc. need to be the same too.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/yum-chroot.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/yum-missingok.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list