[yum] update to latest HEAD
Valentina Mukhamedzhanova
vmukhame at fedoraproject.org
Wed Jun 18 12:07:49 UTC 2014
commit 892f7648cc852d748f484a884227eca981ab0844
Author: Valentina Mukhamedzhanova <vmukhame at redhat.com>
Date: Wed Jun 18 14:07:40 2014 +0200
update to latest HEAD
- Workaround the TypeError in _filter_deps(). BZ 1108625
yum-HEAD.patch | 37 ++++++++++++++++++++-----------------
yum.spec | 6 +++++-
2 files changed, 25 insertions(+), 18 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 7b31cfe..31b3828 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -200728,7 +200728,7 @@ index 4af563a..a702ac1 100644
self.obsoletes = {} #obs[obsoletename] = [pkg1, pkg2, pkg3]
#the package lists are packages that obsolete the key name
diff --git a/yum/packages.py b/yum/packages.py
-index 5ef9951..eebeb9d 100644
+index 5ef9951..b219ada 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -38,6 +38,7 @@ import struct
@@ -201226,7 +201226,7 @@ index 5ef9951..eebeb9d 100644
def _loadSummary(self):
# Summaries "can be" empty, which rpm return [], see BZ 473239, *sigh*
if self._loaded_summary is None:
-@@ -1338,6 +1415,17 @@ class YumHeaderPackage(YumAvailablePackage):
+@@ -1338,6 +1415,20 @@ class YumHeaderPackage(YumAvailablePackage):
def _get_hdr(self):
return self.hdr
@@ -201234,17 +201234,20 @@ index 5ef9951..eebeb9d 100644
+ newname = []
+ newflag = []
+ newvers = []
-+ for (n, f, v) in zip(name, flag, vers):
-+ if f & andmask == resmask:
-+ newname.append(n)
-+ newflag.append(f)
-+ newvers.append(v)
-+ return (newname, newflag, newvers)
++ try:
++ for (n, f, v) in zip(name, flag, vers):
++ if f & andmask == resmask:
++ newname.append(n)
++ newflag.append(f)
++ newvers.append(v)
++ return (newname, newflag, newvers)
++ except TypeError:
++ return [], [], []
+
def _populatePrco(self):
"Populate the package object with the needed PRCO interface."
-@@ -1345,6 +1433,17 @@ class YumHeaderPackage(YumAvailablePackage):
+@@ -1345,6 +1436,17 @@ class YumHeaderPackage(YumAvailablePackage):
"CONFLICT": misc.share_data("conflicts"),
"REQUIRE": misc.share_data("requires"),
"PROVIDE": misc.share_data("provides") }
@@ -201262,7 +201265,7 @@ index 5ef9951..eebeb9d 100644
hdr = self._get_hdr()
for tag in tag2prco:
name = hdr[getattr(rpm, 'RPMTAG_%sNAME' % tag)]
-@@ -1353,16 +1452,48 @@ class YumHeaderPackage(YumAvailablePackage):
+@@ -1353,16 +1455,48 @@ class YumHeaderPackage(YumAvailablePackage):
continue
lst = hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)]
@@ -201320,7 +201323,7 @@ index 5ef9951..eebeb9d 100644
def tagByName(self, tag):
warnings.warn("tagByName() will go away in a furture version of Yum.\n",
-@@ -1438,16 +1569,16 @@ class YumHeaderPackage(YumAvailablePackage):
+@@ -1438,16 +1572,16 @@ class YumHeaderPackage(YumAvailablePackage):
# then create a _loadChangelog() method to put them into the
# self._changelog attr
if len(self.hdr['changelogname']) > 0:
@@ -201341,7 +201344,7 @@ index 5ef9951..eebeb9d 100644
def _is_pre_req(self, flag):
"""check the flags for a requirement, return 1 or 0 whether or not requires
-@@ -1708,6 +1839,7 @@ class YUMVerifyPackage:
+@@ -1708,6 +1842,7 @@ class YUMVerifyPackage:
self._files = {}
@@ -201349,7 +201352,7 @@ index 5ef9951..eebeb9d 100644
class _RPMVerifyPackage(YUMVerifyPackage):
def __init__(self, po, fi, def_csum_type, patterns, all):
YUMVerifyPackage.__init__(self, po)
-@@ -1720,18 +1852,30 @@ class _RPMVerifyPackage(YUMVerifyPackage):
+@@ -1720,18 +1855,30 @@ class _RPMVerifyPackage(YUMVerifyPackage):
(fi, def_csum_type, patterns, all) = self._presetup
del self._presetup
@@ -201381,7 +201384,7 @@ index 5ef9951..eebeb9d 100644
def __contains__(self, *args, **kwargs):
self._setup()
-@@ -1763,7 +1907,8 @@ class YumInstalledPackage(YumHeaderPackage):
+@@ -1763,7 +1910,8 @@ class YumInstalledPackage(YumHeaderPackage):
self.yumdb_info = yumdb.get_package(self)
def verify(self, patterns=[], deps=False, script=False,
@@ -201391,7 +201394,7 @@ index 5ef9951..eebeb9d 100644
"""verify that the installed files match the packaged checksum
optionally verify they match only if they are in the 'pattern' list
returns a tuple """
-@@ -1891,17 +2036,22 @@ class YumInstalledPackage(YumHeaderPackage):
+@@ -1891,17 +2039,22 @@ class YumInstalledPackage(YumHeaderPackage):
problems.append(prob)
my_mode = my_st.st_mode
@@ -201417,7 +201420,7 @@ index 5ef9951..eebeb9d 100644
if not pf.digest:
verify_digest = False
-@@ -1946,7 +2096,7 @@ class YumInstalledPackage(YumHeaderPackage):
+@@ -1946,7 +2099,7 @@ class YumInstalledPackage(YumHeaderPackage):
my_csum = digest_type + ':' + my_csum
my_st_size = fp.read_size
@@ -201426,7 +201429,7 @@ index 5ef9951..eebeb9d 100644
prob = _PkgVerifyProb('checksum',
'checksum does not match', ftypes)
prob.database_value = csum
-@@ -2120,11 +2270,11 @@ class YumLocalPackage(YumHeaderPackage):
+@@ -2120,11 +2273,11 @@ class YumLocalPackage(YumHeaderPackage):
relpath = self.localpath
if self._baseurl:
diff --git a/yum.spec b/yum.spec
index 54dedba..51be47c 100644
--- a/yum.spec
+++ b/yum.spec
@@ -64,7 +64,7 @@ BuildRequires: bash-completion
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 151%{?dist}
+Release: 152%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -507,6 +507,10 @@ exit 0
%endif
%changelog
+* Wed Jun 18 2014 James Antill <james at fedoraproject.org> - 3.4.3-152
+- update to latest HEAD
+- Workaround the TypeError in _filter_deps(). BZ 1108625
+
* Mon Jun 16 2014 James Antill <james at fedoraproject.org> - 3.4.3-151
- update to latest HEAD
- Read FS yumvars before yum.conf setup, and reread if installroot changed.
More information about the scm-commits
mailing list