rpms/yum/devel yum-big-head.patch,1.4,1.5 yum.spec,1.209,1.210
Seth Vidal (skvidal)
fedora-extras-commits at redhat.com
Tue Apr 15 13:12:17 UTC 2008
Author: skvidal
Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7846
Modified Files:
yum-big-head.patch yum.spec
Log Message:
fixes for f9 GA
yum-big-head.patch:
Index: yum-big-head.patch
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum-big-head.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-big-head.patch 14 Apr 2008 17:08:45 -0000 1.4
+++ yum-big-head.patch 15 Apr 2008 13:12:08 -0000 1.5
@@ -112,7 +112,7 @@
help=_("answer yes for all questions"))
self.add_option("--version", action="store_true",
diff --git a/output.py b/output.py
-index 532a06e..3ef850d 100644
+index 532a06e..cc80301 100644
--- a/output.py
+++ b/output.py
@@ -23,13 +23,13 @@ import logging
@@ -162,7 +162,33 @@
except:
choice = ''
choice = choice.lower()
-@@ -747,7 +749,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
+@@ -370,21 +372,22 @@ class YumOutput:
+ print _(' Description: %s') % group.description.encode("UTF-8")
+ if len(group.mandatory_packages) > 0:
+ print _(' Mandatory Packages:')
+- for item in group.mandatory_packages:
++ for item in sorted(group.mandatory_packages):
+ print ' %s' % item
+
+ if len(group.default_packages) > 0:
+ print _(' Default Packages:')
+- for item in group.default_packages:
++ for item in sorted(group.default_packages):
+ print ' %s' % item
+
+ if len(group.optional_packages) > 0:
+ print _(' Optional Packages:')
+- for item in group.optional_packages:
++ for item in sorted(group.optional_packages):
+ print ' %s' % item
+
+ if len(group.conditional_packages) > 0:
+ print _(' Conditional Packages:')
++ # FIXME: Why is this different?
+ for item, cond in group.conditional_packages.iteritems():
+ print ' %s' % (item,)
+
+@@ -747,7 +750,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
fmt = self._makefmt(percent, ts_current, ts_total)
msg = fmt % (process, pkgname)
if msg != self.lastmsg:
@@ -171,7 +197,7 @@
sys.stdout.flush()
self.lastmsg = msg
if te_current == te_total:
-@@ -755,7 +757,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
+@@ -755,7 +758,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
def scriptout(self, package, msgs):
if msgs:
@@ -8917,7 +8943,7 @@
import yum.plugins as plugins
diff --git a/yum/__init__.py b/yum/__init__.py
-index 270f79f..7bf6ff3 100644
+index 270f79f..a4b9dd1 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -63,7 +63,7 @@ warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
@@ -8940,7 +8966,7 @@
if debuglevel != None:
startupconf.debuglevel = debuglevel
-@@ -759,11 +761,19 @@ class YumBase(depsolve.Depsolve):
+@@ -759,11 +761,30 @@ class YumBase(depsolve.Depsolve):
def runTransaction(self, cb):
"""takes an rpm callback object, performs the transaction"""
@@ -8955,13 +8981,34 @@
self.plugins.run('pretrans')
errors = self.ts.run(cb.callback, '')
- if errors:
+- if errors:
- errstring = '\n'.join(errors)
++ # ts.run() exit codes are, hmm, "creative": None means all ok, empty
++ # list means some errors happened in the transaction and non-empty
++ # list that there were errors preventing the ts from starting...
++ if errors is None:
++ pass
++ elif len(errors) == 0:
++ errstring = _('Warning: errors occurred during transaction.')
++ raise Errors.YumBaseError, errstring
++ else:
++ errstring = '\n'.join(map(_tup2str, errors))
++ raise Errors.YumBaseError, errstring
++
+ errstring = '\n'.join(map(_tup2str, errors))
raise Errors.YumBaseError, errstring
if not self.conf.keepcache:
-@@ -2619,7 +2629,7 @@ class YumBase(depsolve.Depsolve):
+@@ -2206,6 +2227,8 @@ class YumBase(depsolve.Depsolve):
+ if thispkgobsdict.has_key(po.pkgtup):
+ obsoleting = thispkgobsdict[po.pkgtup][0]
+ obsoleting_pkg = self.getPackageObject(obsoleting)
++ self.verbose_logger.warning(_('Package %s is obsoleted by %s, trying to install %s instead'),
++ po.name, obsoleting_pkg.name, obsoleting_pkg)
+ self.install(po=obsoleting_pkg)
+ continue
+
+@@ -2619,7 +2642,7 @@ class YumBase(depsolve.Depsolve):
rawkey = urlgrabber.urlread(keyurl, limit=9999)
except urlgrabber.grabber.URLGrabError, e:
raise Errors.YumBaseError(_('GPG key retrieval failed: ') +
@@ -9032,7 +9079,7 @@
+ import __builtin__
+ __builtin__.__dict__['_'] = dummy_wrapper
diff --git a/yum/misc.py b/yum/misc.py
-index 44f85d4..a7090c9 100644
+index 44f85d4..d710ad1 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -20,11 +20,29 @@ import gpgme
@@ -9055,7 +9102,7 @@
+ # hahahah, of course the above means that:
+ # hash(('a', 'b')) == hash((u'a', u'b'))
+ # ...which we have in deptuples, so just screw sharing those atm.
-+ if type(value) == type(tuple):
++ if type(value) == types.TupleType:
+ return value
+ return store.setdefault(value, value)
+
@@ -9067,7 +9114,18 @@
_re_compiled_glob_match = None
def re_glob(s):
-@@ -515,11 +533,26 @@ def find_ts_remaining(timestamp, yumlibpath='/var/lib/yum'):
+@@ -440,10 +458,6 @@ def get_running_kernel_version_release(ts):
+ if ver.endswith(s):
+ reduced = ver.replace(s, "")
+
+- if reduced.find("-") != -1:
+- (v, r) = reduced.split("-", 1)
+- return (v, r)
+-
+ # we've got nothing so far, so... we glob for the file that MIGHT have
+ # this kernels and then look up the file in our rpmdb
+ fns = glob.glob('/boot/vmlinuz*%s*' % ver)
+@@ -515,11 +529,26 @@ def find_ts_remaining(timestamp, yumlibpath='/var/lib/yum'):
return to_complete_items
Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- yum.spec 14 Apr 2008 17:08:45 -0000 1.209
+++ yum.spec 15 Apr 2008 13:12:08 -0000 1.210
@@ -3,7 +3,7 @@
Summary: RPM installer/updater
Name: yum
Version: 3.2.14
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -105,6 +105,9 @@
%dir /usr/lib/yum-plugins
%changelog
+* Tue Apr 15 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-8
+- after many tries - this one fixes translations AND pungi
+
* Thu Apr 10 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-5
- once more, with feeling
More information about the fedora-extras-commits
mailing list