rpms/yum/F-7 yum-misc-fixes.patch,1.8,1.9 yum.spec,1.166,1.167
Seth Vidal (skvidal)
fedora-extras-commits at redhat.com
Mon Oct 8 16:28:36 UTC 2007
Author: skvidal
Update of /cvs/extras/rpms/yum/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14789
Modified Files:
yum-misc-fixes.patch yum.spec
Log Message:
misc patches and spec file
yum-misc-fixes.patch:
Index: yum-misc-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/yum-misc-fixes.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- yum-misc-fixes.patch 30 Apr 2007 19:49:30 -0000 1.8
+++ yum-misc-fixes.patch 8 Oct 2007 16:28:26 -0000 1.9
@@ -1,30 +1,65 @@
-Index: yum/yumRepo.py
-===================================================================
-RCS file: /home/groups/yum/cvs/yum/yum/yumRepo.py,v
-retrieving revision 1.46
-retrieving revision 1.47
-diff -u -r1.46 -r1.47
---- yum/yumRepo.py 25 Apr 2007 22:23:10 -0000 1.46
-+++ yum/yumRepo.py 29 Apr 2007 13:51:13 -0000 1.47
-@@ -35,6 +35,9 @@
- import logging
- import logginglevels
-
-+import warnings
-+warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
+diff --git a/yum/__init__.py b/yum/__init__.py
+index effbb64..b5009c0 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -612,8 +612,8 @@ class YumBase(depsolve.Depsolve):
+ costs = {}
+ for r in self.repos.listEnabled():
+ costs[r.cost] = 1
+-
+- if len(costs.keys()) == 1: # if all of our costs are the same then return
+
- logger = logging.getLogger("yum.Repos")
- verbose_logger = logging.getLogger("yum.verbose.Repos")
++ if len(costs.keys()) <= 1: # if all of our costs are the same then return
+ return
+
+ def _sort_by_cost(a, b):
+diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
+index fe293d1..a3cb203 100644
+--- a/yum/rpmtrans.py
++++ b/yum/rpmtrans.py
+@@ -108,8 +108,12 @@ class RPMBaseCallback:
+ print >> sys.stderr, msg
+
+ def filelog(self, package, action):
+- # check package object type - if it is a string - just output it
+- msg = '%s: %s' % (self.fileaction[action], package)
++ # If the action is not in the fileaction list then dump it as a string
++ # hurky but, sadly, not much else
++ if self.fileaction.has_key(action):
++ msg = '%s: %s' % (self.fileaction[action], package)
++ else:
++ msg = '%s: %s' % (package, action)
+ self.logger.info(msg)
+
-@@ -468,7 +471,10 @@
- self._baseurlSetup()
- return self._urls
+@@ -220,7 +224,7 @@ class RPMTransaction:
+ # some curveballs
+ if len(self._te_tuples) == 0:
+ msg = 'extra callback for package %s in state %d' % (package, action)
+- self.display.filelog(msg)
++ self.display.filelog(package, msg)
+ return
-- urls = property(lambda self: self._geturls())
-+ urls = property(fget=lambda self: self._geturls(),
-+ fset=lambda self, value: setattr(self, "_urls", value),
-+ fdel=lambda self: setattr(self, "_urls", None))
-+
+ (t,e,n,v,r,a) = self._te_tuples[0] # what we should be on
+@@ -229,10 +233,10 @@ class RPMTransaction:
+ msg = 'ts_done state is %s %s should be %s %s' % (package, action, t, n)
+ if action in TS_REMOVE_STATES:
+ if t != 'erase':
+- self.display.filelog(msg)
++ self.display.filelog(package, msg)
+ if action in TS_INSTALL_STATES:
+ if t != 'install':
+- self.display.filelog(msg)
++ self.display.filelog(package, msg)
+
+ # check the pkg name out to make sure it matches
+ if type(package) in types.StringTypes:
+@@ -242,7 +246,7 @@ class RPMTransaction:
+
+ if n != name:
+ msg = 'ts_done name in te is %s should be %s' % (n, package)
+- self.display.filelog(msg)
++ self.display.filelog(package, msg)
- def _getFile(self, url=None, relative=None, local=None, start=None, end=None,
- copy_local=0, checkfunc=None, text=None, reget='simple', cache=True):
+ # hope springs eternal that this isn't wrong
+ msg = '%s %s:%s-%s-%s.%s\n' % (t,e,n,v,r,a)
Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/yum.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- yum.spec 5 Oct 2007 16:13:49 -0000 1.166
+++ yum.spec 8 Oct 2007 16:28:26 -0000 1.167
@@ -3,13 +3,14 @@
Summary: RPM installer/updater
Name: yum
Version: 3.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
Source1: yum.conf.fedora
Source2: yum-updatesd.conf.fedora
Patch0: installonlyn-enable.patch
+Patch1: yum-misc-fixes.patch
URL: http://linux.duke.edu/yum/
BuildArch: noarch
@@ -45,7 +46,7 @@
%prep
%setup -q
%patch0 -p0 -b .installonly
-
+%patch1 -p1 -b .misc
%build
make
@@ -110,6 +111,10 @@
%changelog
+* Mon Oct 8 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.6-2
+- pre-3.2.7 patches
+
+
* Fri Oct 5 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.6-1
- 3.2.6
More information about the fedora-extras-commits
mailing list