[yum/f18] update to latest HEAD.
James Antill
james at fedoraproject.org
Wed Sep 12 12:08:34 UTC 2012
commit ec16d690a46d15ffb7bd30e16d7465a226eaad5f
Author: James Antill <james at and.org>
Date: Wed Sep 12 08:08:22 2012 -0400
update to latest HEAD.
- Write out groupid and not optionid, for environment groups.
yum-HEAD.patch | 52 ++++++++++++++++++++++++++++++++++++++++------------
yum.spec | 6 +++++-
2 files changed, 45 insertions(+), 13 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index e4c51b8..41dc2e8 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -154938,7 +154938,7 @@ index 7ad25ce..a9a8e53 100644
pass
diff --git a/yum/comps.py b/yum/comps.py
-index 65f6d5e..08e66b9 100755
+index 65f6d5e..4e765ef 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -43,6 +43,16 @@ class CompsObj(object):
@@ -155096,7 +155096,7 @@ index 65f6d5e..08e66b9 100755
+ msg += """ </grouplist>\n"""
+ msg += """ <optionlist>\n"""
+ for grp in self.options:
-+ msg += """ <optionid>%s</optionid>\n""" % grp
++ msg += """ <groupid>%s</groupid>\n""" % grp
+ msg += """ </optionlist>\n"""
+ msg += """ </environment>\n"""
+
@@ -157735,7 +157735,7 @@ index aaa4f25..61aa586 100755
continue
diff --git a/yum/misc.py b/yum/misc.py
-index 2f6ddfe..a39a222 100644
+index 2f6ddfe..43f34f8 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -8,6 +8,7 @@ import os
@@ -157872,6 +157872,15 @@ index 2f6ddfe..a39a222 100644
return out
+@@ -1126,6 +1163,8 @@ def repo_gen_decompress(filename, generated_name, cached=False):
+ dest = os.path.dirname(filename)
+ dest += '/gen'
+ if not os.path.exists(dest):
++ if cached:
++ return None
+ os.makedirs(dest, mode=0755)
+ dest += '/' + generated_name
+ return decompress(filename, dest=dest, check_timestamps=True,fn_only=cached)
diff --git a/yum/packageSack.py b/yum/packageSack.py
index 4af563a..47832fc 100644
--- a/yum/packageSack.py
@@ -159393,7 +159402,7 @@ index 2cb1acb..0586c1c 100644
for pkg in un['pkglist']:
for filedata in pkg['packages']:
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
-index e5e9ece..21f65f7 100644
+index e5e9ece..b057961 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -20,10 +20,12 @@ import time
@@ -159487,7 +159496,7 @@ index e5e9ece..21f65f7 100644
+ db_un_fn = self._check_uncompressed_db_gen(repo,
+ mydbtype)
+ if not db_un_fn: # Shouldn't happen?
-+ raise URLGrabError(-1, 'Check uncompressed DB failed')
++ raise Errors.RepoError, '%s: Check uncompressed DB failed' % repo
dobj = repo.cacheHandler.open_database(db_un_fn)
@@ -159501,7 +159510,7 @@ index e5e9ece..21f65f7 100644
+ gen = mymdtype + '.xml'
+ ret = misc.repo_gen_decompress(xml, gen, cached=repo.cache)
+ if not ret:
-+ raise URLGrabError(-1, 'Decompress DB failed')
++ raise Errors.RepoError, '%s: Decompress DB failed' % repo
+ xml = ret
+ # Convert XML => .sqlite
xmldata = repo.repoXML.getData(mymdtype)
@@ -159717,7 +159726,8 @@ index e5e9ece..21f65f7 100644
- result = ug.urlgrab(url, local, text=self.id + "/metalink")
+ result = ug.urlgrab(url, local, text="%s/metalink" % self.ui_id)
- except urlgrabber.grabber.URLGrabError, e:
+- except urlgrabber.grabber.URLGrabError, e:
++ except URLGrabError, e:
if not os.path.exists(self.metalink_filename):
msg = ("Cannot retrieve metalink for repository: %s. "
- "Please verify its path and try again" % self )
@@ -159974,14 +159984,14 @@ index e5e9ece..21f65f7 100644
- if len(downloading_with_size) == 1:
- downloading_no_size.extend(downloading_with_size)
- downloading_with_size = []
-+ def _commonRetrieveDataMD_done(self, downloading):
-+ """ Uncompress the downloaded metadata """
-
+-
- remote_size = 0
- local_size = 0
- for (ndata, nmdtype) in downloading_with_size: # Get total size...
- remote_size += int(ndata.size)
--
++ def _commonRetrieveDataMD_done(self, downloading):
++ """ Uncompress the downloaded metadata """
+
- for (ndata, nmdtype) in downloading_with_size:
- urlgrabber.progress.text_meter_total_size(remote_size, local_size)
- if not self._retrieveMD(nmdtype, retrieve_can_fail=True):
@@ -160155,7 +160165,7 @@ index e5e9ece..21f65f7 100644
+ fn = self._retrieveMD('group_gz', retrieve_can_fail=True)
+ if fn:
+ try:
-+ fn = misc.repo_gen_decompress(fn, 'comps.xml')
++ fn = misc.repo_gen_decompress(fn, 'comps.xml', cached=self.cache)
+ except IOError, e:
+ logger.warning(e)
+ fn = None
@@ -160178,6 +160188,24 @@ index e5e9ece..21f65f7 100644
continue
mirror = line.rstrip() # no more trailing \n's
mirror = mirror.replace('$ARCH', '$BASEARCH')
+@@ -1713,7 +1852,7 @@ class YumRepository(Repository, config.RepoConf):
+ ugopts = self._default_grabopts()
+ try:
+ fo = urlgrabber.grabber.urlopen(url, **ugopts)
+- except urlgrabber.grabber.URLGrabError, e:
++ except URLGrabError, e:
+ print "Could not retrieve mirrorlist %s error was\n%s: %s" % (url, e.args[0], misc.to_unicode(e.args[1]))
+ fo = None
+
+@@ -1877,7 +2016,7 @@ def getMirrorList(mirrorlist, pdict = None):
+
+ try:
+ fo = urlresolver.urlopen(url, proxies=pdict)
+- except urlgrabber.grabber.URLGrabError, e:
++ except URLGrabError, e:
+ print "Could not retrieve mirrorlist %s error was\n%s: %s" % (url, e.args[0], misc.to_unicode(e.args[1]))
+ fo = None
+
diff --git a/yumcommands.py b/yumcommands.py
index 4dcbea7..a2e0b1b 100644
--- a/yumcommands.py
diff --git a/yum.spec b/yum.spec
index 440ce8d..f432d12 100644
--- a/yum.spec
+++ b/yum.spec
@@ -18,7 +18,7 @@
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 43%{?dist}
+Release: 44%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -315,6 +315,10 @@ exit 0
%endif
%changelog
+* Wed Sep 12 2012 James Antill <james at fedoraproject.org> - 3.4.3-44
+- update to latest HEAD.
+- Write out groupid and not optionid, for environment groups.
+
* Fri Sep 7 2012 James Antill <james at fedoraproject.org> - 3.4.3-43
- update to latest HEAD.
- Use .ui_id explicitly for backcompat. on strings, *sigh*.
More information about the scm-commits
mailing list