[yum] update to latest HEAD.
James Antill
james at fedoraproject.org
Wed May 1 05:46:09 UTC 2013
commit 14d5a50c0a0f7823d7da161a1a0c12e52406c06a
Author: James Antill <james at and.org>
Date: Wed May 1 01:45:55 2013 -0400
update to latest HEAD.
- Allow default on Environment optional groups.
- Tweak load-ts output.
yum-HEAD.patch | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 306c178..00573c9 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -183027,10 +183027,10 @@ index 812785a..68f5ef9 100644
def resolveCode(self,skip = False):
solver = YumBase()
diff --git a/test/testbase.py b/test/testbase.py
-index d0f22be..13ef821 100644
+index d0f22be..ce4a1dd 100644
--- a/test/testbase.py
+++ b/test/testbase.py
-@@ -55,6 +55,15 @@ class FakeConf(object):
+@@ -55,6 +55,16 @@ class FakeConf(object):
self.protected_packages = []
self.protected_multilib = False
self.clean_requirements_on_remove = True
@@ -183043,10 +183043,11 @@ index d0f22be..13ef821 100644
+ self.config_file_age = 0
+ self.yumvar = {}
+ self.reposdir = '/tmp/XXXX'
++ self.diskspacecheck = True
class FakeSack:
""" Fake PackageSack to use with FakeRepository"""
-@@ -138,6 +147,7 @@ class FakePackage(packages.YumAvailablePackage):
+@@ -138,6 +148,7 @@ class FakePackage(packages.YumAvailablePackage):
self.yumdb_info = FakeYumDBInfo()
self.prco['provides'].append((name, 'EQ', (epoch, version, release)))
@@ -183054,7 +183055,7 @@ index d0f22be..13ef821 100644
# Just a unique integer
self.id = self.__hash__()
-@@ -149,6 +159,7 @@ class FakePackage(packages.YumAvailablePackage):
+@@ -149,6 +160,7 @@ class FakePackage(packages.YumAvailablePackage):
self.prco['provides'].append((name, flag, evr))
def addRequires(self, name, flag=None, evr=(None, None, None)):
self.prco['requires'].append((name, flag, evr))
@@ -183062,7 +183063,7 @@ index d0f22be..13ef821 100644
def addRequiresPkg(self, pkg):
self.required_pkgs.append(pkg)
def addRequiringPkg(self, pkg):
-@@ -310,6 +321,12 @@ class FakeRpmDb(packageSack.PackageSack):
+@@ -310,6 +322,12 @@ class FakeRpmDb(packageSack.PackageSack):
if len(pkg.conflicts):
ret.append(pkg)
return ret
@@ -183075,7 +183076,7 @@ index d0f22be..13ef821 100644
def fileRequiresData(self):
installedFileRequires = {}
installedUnresolvedFileRequires = set()
-@@ -344,6 +361,8 @@ class FakeRpmDb(packageSack.PackageSack):
+@@ -344,6 +362,8 @@ class FakeRpmDb(packageSack.PackageSack):
return
def transactionCacheConflictPackages(self, pkgs):
return
More information about the scm-commits
mailing list