rpms/yum/devel version-None-tuple.patch, NONE, 1.1 yum.spec, 1.173, 1.174
Seth Vidal (skvidal)
fedora-extras-commits at redhat.com
Wed Aug 29 14:27:42 UTC 2007
Author: skvidal
Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9833
Modified Files:
yum.spec
Added Files:
version-None-tuple.patch
Log Message:
ver-to-none patch for rawhide - in upstream now
version-None-tuple.patch:
--- NEW FILE version-None-tuple.patch ---
>From 4804c8a71070bb4f3b1c343ed1c9e52bfcca5818 Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti at redhat.com>
Date: Thu, 23 Aug 2007 16:17:33 +0200
Subject: [PATCH] Change default value of "version" from None to (None, None, None) for
all .get(Provides|Requires) methods to avoid traceback in PackageSack
---
yum/packageSack.py | 12 ++++++------
yum/rpmsack.py | 4 ++--
yum/sqlitesack.py | 4 ++--
yum/transactioninfo.py | 12 ++++++------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/yum/packageSack.py b/yum/packageSack.py
index dc04d8f..894e3f7 100644
--- a/yum/packageSack.py
+++ b/yum/packageSack.py
@@ -65,11 +65,11 @@ class PackageSackBase(object):
(n,a,e,v,r) = pkgtup
return self.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)
- def getProvides(self, name, flags=None, version=None):
+ def getProvides(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }"""
raise NotImplementedError()
- def getRequires(self, name, flags=None, version=None):
+ def getRequires(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching requires }"""
raise NotImplementedError()
@@ -228,11 +228,11 @@ class MetaSack(PackageSackBase):
"""return list of pkgobjects matching the nevra requested"""
return self._computeAggregateListResult("searchNevra", name, epoch, ver, rel, arch)
- def getProvides(self, name, flags=None, version=None):
+ def getProvides(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }"""
return self._computeAggregateDictResult("getProvides", name, flags, version)
- def getRequires(self, name, flags=None, version=None):
+ def getRequires(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching requires }"""
return self._computeAggregateDictResult("getRequires", name, flags, version)
@@ -443,7 +443,7 @@ class PackageSack(PackageSackBase):
else:
return []
- def getProvides(self, name, flags=None, version=None):
+ def getProvides(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }"""
self._checkIndexes(failure='build')
result = { }
@@ -453,7 +453,7 @@ class PackageSack(PackageSackBase):
result[po] = hits
return result
- def getRequires(self, name, flags=None, version=None):
+ def getRequires(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching requires }"""
self._checkIndexes(failure='build')
result = { }
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 1bed494..fb11b50 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -383,7 +383,7 @@ class RPMDBPackageSack(PackageSackBase):
# Can't support this now
raise NotImplementedError
- def getProvides(self, name, flags=None, version=None):
+ def getProvides(self, name, flags=None, version=(None, None, None)):
"""searches the rpmdb for what provides the arguments
returns a list of pkgtuples of providing packages, possibly empty"""
@@ -418,7 +418,7 @@ class RPMDBPackageSack(PackageSackBase):
# XXX deprecate?
return [po.pkgtup for po in self.getProvides(name, flags, version)]
- def getRequires(self, name, flags=None, version=None):
+ def getRequires(self, name, flags=None, version=(None, None, None)):
"""searches the rpmdb for what provides the arguments
returns a list of pkgtuples of providing packages, possibly empty"""
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 9330876..dc10db4 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -489,10 +489,10 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
self._search_cache[prcotype][req] = result
return result
- def getProvides(self, name, flags=None, version=None):
+ def getProvides(self, name, flags=None, version=(None, None, None)):
return self._search("provides", name, flags, version)
- def getRequires(self, name, flags=None, version=None):
+ def getRequires(self, name, flags=None, version=(None, None, None)):
return self._search("requires", name, flags, version)
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index b1d9af1..3ed67c5 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -375,7 +375,7 @@ class TransactionData:
self.rpmdb = rpmdb
self.pkgSack = pkgSack
- def getNewProvides(self, name, flag=None, version=None):
+ def getNewProvides(self, name, flag=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }
searches in packages to be installed"""
result = { }
@@ -386,7 +386,7 @@ class TransactionData:
result.update(self.localSack.getProvides(name, flag, version))
return result
- def getOldProvides(self, name, flag=None, version=None):
+ def getOldProvides(self, name, flag=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }
searches in packages already installed and not going to be removed"""
result = { }
@@ -395,13 +395,13 @@ class TransactionData:
result[pkg] = hits
return result
- def getProvides(self, name, flag=None, version=None):
+ def getProvides(self, name, flag=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }"""
result = self.getOldProvides(name, flag, version)
result.update(self.getNewProvides(name, flag, version))
return result
- def getNewRequires(self, name, flag=None, version=None):
+ def getNewRequires(self, name, flag=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }
searches in packages to be installed"""
result = { }
@@ -413,7 +413,7 @@ class TransactionData:
return result
- def getOldRequires(self, name, flag=None, version=None):
+ def getOldRequires(self, name, flag=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }
searches in packages already installed and not going to be removed"""
result = { }
@@ -422,7 +422,7 @@ class TransactionData:
result[pkg] = hits
return result
- def getRequires(self, name, flag=None, version=None):
+ def getRequires(self, name, flag=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }"""
result = self.getOldRequires(name, flag, version)
result.update(self.getNewRequires(name, flag, version))
--
1.5.2.2
Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- yum.spec 28 Aug 2007 22:46:30 -0000 1.173
+++ yum.spec 29 Aug 2007 14:27:10 -0000 1.174
@@ -3,13 +3,14 @@
Summary: RPM installer/updater
Name: yum
Version: 3.2.4
-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: version-None-tuple.patch
URL: http://linux.duke.edu/yum/
BuildArch: noarch
@@ -46,6 +47,7 @@
%prep
%setup -q
%patch0 -p0 -b .installonly
+%patch1 -p1 -b .ver-to-none
%build
make
@@ -91,6 +93,9 @@
%dir /usr/lib/yum-plugins
%changelog
+* Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.4-2
+- add ver-to-none patch to fix, a lot of things, actually.
+
* Tue Aug 28 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.4-1
- 3.2.4 release
- add python-iniparse dep
More information about the scm-commits
mailing list