diff --git a/BZ-870691-repos-with-no-url.patch b/BZ-870691-repos-with-no-url.patch new file mode 100644 index 0000000..16ca85d --- /dev/null +++ b/BZ-870691-repos-with-no-url.patch @@ -0,0 +1,22 @@ +commit 40d9d5f4c3a00b2efa6ee0b64fe4d1ec52d46a69 +Author: Zdeněk Pavlas +Date: Mon Oct 29 09:22:02 2012 +0100 + + ui_id: prevent TB on invalid repos with no URLs. BZ 870691. + +diff --git a/yum/yumRepo.py b/yum/yumRepo.py +index e362c43..414f1d9 100644 +--- a/yum/yumRepo.py ++++ b/yum/yumRepo.py +@@ -381,8 +381,10 @@ class YumRepository(Repository, config.RepoConf): + val = ini['metalink'] + elif 'mirrorlist' in ini: + val = ini['mirrorlist'] +- else: ++ elif 'baseurl' in ini: + val = ini['baseurl'] ++ else: ++ val = '' + ret = self.id + if '$releasever' in val: + ret += '/' diff --git a/BZ-881756-include-langpacks.patch b/BZ-881756-include-langpacks.patch new file mode 100644 index 0000000..781e49e --- /dev/null +++ b/BZ-881756-include-langpacks.patch @@ -0,0 +1,208 @@ +From 6ef7823406da1e044ca188a9c96fe867a5e8c36f Mon Sep 17 00:00:00 2001 +From: Daniel Mach +Date: Tue, 16 Oct 2012 07:10:13 -0400 +Subject: Include langpacks when reading and writing comps. + +The comps section defines patterns used by the yum-langpacks plugin. +We want to keep them when writing comps. +--- + yum/comps.py | 93 +++++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 files changed, 80 insertions(+), 13 deletions(-) + +diff --git a/yum/comps.py b/yum/comps.py +index 4e765ef..fe5649d 100755 +--- a/yum/comps.py ++++ b/yum/comps.py +@@ -16,14 +16,14 @@ + + import types + import sys +-from constants import * +-from Errors import CompsException ++from yum.constants import * ++from yum.Errors import CompsException + #FIXME - compsexception isn't caught ANYWHERE so it's pointless to raise it + # switch all compsexceptions to grouperrors after api break + import fnmatch + import re + from yum.i18n import to_unicode +-from misc import get_my_lang_code ++from yum.misc import get_my_lang_code + from yum.misc import cElementTree_iterparse as iterparse + + lang_attr = '{http://www.w3.org/XML/1998/namespace}lang' +@@ -281,7 +281,6 @@ class Group(CompsObj): + + return msg + +- + class Environment(CompsObj): + """ Environment object parsed from group data in each repo, and merged """ + +@@ -512,13 +511,61 @@ class Category(CompsObj): + msg += """ \n""" + + return msg +- ++ ++class Langpacks(CompsObj): ++ def __init__(self, elem=None): ++ self.langpacks = [] ++ self.name = "" # prevent CompsObj.__str__() throwing an AttributeError ++ if elem is not None: ++ self.parse(elem) ++ ++ def __getitem__(self, indx): ++ return self.langpacks[indx] ++ ++ def __iter__(self): ++ for i in self.langpacks: ++ yield i ++ ++ def __len__(self): ++ return len(self.langpacks) ++ ++ def add(self, name, install): ++ langpack = { ++ "name": name, ++ "install": install, ++ } ++ self.langpacks.append(langpack) ++ ++ def parse(self, elem): ++ for child in elem: ++ if child.tag == "match": ++ langpack = { ++ "name": child.attrib.get("name"), ++ "install": child.attrib.get("install"), ++ } ++ self.langpacks.append(langpack) ++ else: ++ raise CompsException("Unexpected element in : %s" % child.tag) ++ ++ self.name = elem.attrib.get("name") ++ self.install = elem.attrib.get("install") ++ ++ def xml(self): ++ """write out an xml stanza for the Langpacks object""" ++ if not self.langpacks: ++ return '' ++ msg = ' \n' ++ for i in self: ++ msg += ' \n' % (i["name"], i["install"]) ++ msg += ' \n' ++ return msg + + class Comps(object): + def __init__(self, overwrite_groups=False): + self._groups = {} + self._environments = {} + self._categories = {} ++ self._langpacks = Langpacks() + self.compscount = 0 + self.overwrite_groups = overwrite_groups + self.compiled = False # have groups been compiled into avail/installed +@@ -529,7 +576,7 @@ class Comps(object): + grps = self._groups.values() + grps.sort(key=lambda x: (x.display_order, x.name)) + return grps +- ++ + def get_environments(self): + environments = self._environments.values() + environments.sort(key=lambda x: (x.display_order, x.name)) +@@ -539,10 +586,14 @@ class Comps(object): + cats = self._categories.values() + cats.sort(key=lambda x: (x.display_order, x.name)) + return cats ++ ++ def get_langpacks(self): ++ return self._langpacks + + groups = property(get_groups) + environments = property(get_environments) + categories = property(get_categories) ++ langpacks = property(get_langpacks) + + def has_group(self, grpid): + exists = self.return_groups(grpid) +@@ -703,6 +754,9 @@ class Comps(object): + else: + self._categories[category.categoryid] = category + ++ def add_langpack(self, name, install): ++ self._langpacks.add(name, install) ++ + def add(self, srcfile = None): + if not srcfile: + raise CompsException +@@ -732,6 +786,8 @@ class Comps(object): + if elem.tag == "category": + category = Category(elem) + self.add_category(category) ++ if elem.tag == "langpacks": ++ self._langpacks.parse(elem) + except SyntaxError, e: + raise CompsException, "comps file is empty/damaged" + +@@ -791,7 +847,7 @@ class Comps(object): + """returns the xml of the comps files in this class, merged""" + + if not self._groups and not self._categories and \ +- not self._environments: ++ not self._environments and not len(self._langpacks): + return "" + + msg = """ +@@ -805,7 +861,7 @@ class Comps(object): + msg += c.xml() + for e in self.get_environments(): + msg += e.xml() +- ++ msg += self.get_langpacks().xml() + msg += """\n\n""" + + return msg +@@ -820,23 +876,34 @@ def main(): + for srcfile in sys.argv[1:]: + p.add(srcfile) + ++ print ++ print "===== GROUPS =====" + for group in p.groups: +- print group ++ print "%s (id: %s)" % (group, group.groupid) + for pkg in group.packages: + print ' ' + pkg +- ++ ++ print ++ print "===== ENVIRONMENTS =====" + for environment in p.environments: +- print environment.name ++ print "%s (id: %s)" % (environment.name, environment.environmentid) + for group in environment.groups: + print ' ' + group + for group in environment.options: + print ' *' + group + ++ print ++ print "===== CATEGORIES =====" + for category in p.categories: +- print category.name ++ print "%s (id: %s)" % (category.name, category.categoryid) + for group in category.groups: + print ' ' + group +- ++ ++ print ++ print "===== LANGPACKS =====" ++ for langpack in p.langpacks: ++ print ' %s (%s)' % (langpack["name"], langpack["install"]) ++ + except IOError: + print >> sys.stderr, "newcomps.py: No such file:\'%s\'" % sys.argv[1] + sys.exit(1) +-- +1.7.4.4 + diff --git a/BZ-885139-not-enough-arguments.patch b/BZ-885139-not-enough-arguments.patch new file mode 100644 index 0000000..6538675 --- /dev/null +++ b/BZ-885139-not-enough-arguments.patch @@ -0,0 +1,20 @@ +commit 4687ffe032c1a4060da3ef670301df06d0faeb32 +Author: Zdeněk Pavlas +Date: Mon Dec 10 08:55:41 2012 +0100 + + selectGroup(): Fix a typo. BZ 885139 + +diff --git a/yum/__init__.py b/yum/__init__.py +index 6401645..63053af 100644 +--- a/yum/__init__.py ++++ b/yum/__init__.py +@@ -3692,7 +3692,8 @@ much more problems). + if not upgrade and len(txmbrs_used) == old_txmbrs: + self.logger.critical(_('Warning: Group %s does not have any packages to install.'), thisgroup.groupid) + if count_cond_test: +- self.logger.critical(_('Group %s does have %u conditional packages, which may get installed.'), count_cond_test) ++ self.logger.critical(_('Group %s does have %u conditional packages, which may get installed.'), ++ thisgroup.groupid, count_cond_test) + return txmbrs_used + + def deselectGroup(self, grpid, force=False): diff --git a/BZ-908870-MD-files-bad.patch b/BZ-908870-MD-files-bad.patch new file mode 100644 index 0000000..c8d79a8 --- /dev/null +++ b/BZ-908870-MD-files-bad.patch @@ -0,0 +1,241 @@ +commit 83fcbe745c3ee8f5f0fa29626a86c824db059b22 +Author: James Antill +Date: Thu Feb 7 12:58:07 2013 -0500 + + Fix problems with mirrors like wtfnix.com, delete bad MD files. + +diff --git a/yum/yumRepo.py b/yum/yumRepo.py +index dfcf8f9..efbc42a 100644 +--- a/yum/yumRepo.py ++++ b/yum/yumRepo.py +@@ -940,6 +941,7 @@ Insufficient space in download directory %s + range=(start, end), + ) + except URLGrabError, e: ++ self._del_dl_file(local, size) + errstr = "failed to retrieve %s from %s\nerror was %s" % (relative, self, e) + if self.mirrorurls: + errstr +="\n You could try running: yum clean expire-cache" +@@ -961,6 +963,7 @@ Insufficient space in download directory %s + **kwargs + ) + except URLGrabError, e: ++ self._del_dl_file(local, size) + errstr = "failure: %s from %s: %s" % (relative, self, e) + errors = getattr(e, 'errors', None) + raise Errors.NoMoreMirrorsRepoError(errstr, errors) +@@ -1652,6 +1655,18 @@ Insufficient space in download directory %s + raise URLGrabError(-1, 'repomd.xml does not match metalink for %s' % + self) + ++ def _del_dl_file(self, local, size): ++ """ Delete a downloaded file if it's the correct size. """ ++ ++ sd = misc.stat_f(local) ++ if not sd: # File doesn't exist... ++ return ++ ++ if size and sd.st_size < size: ++ return # Still more to get... ++ ++ # Is the correct size, or too big ... delete it so we'll try again. ++ misc.unlink_f(local) + + def checkMD(self, fn, mdtype, openchecksum=False): + """check the metadata type against its checksum""" +@@ -1681,7 +1696,7 @@ Insufficient space in download directory %s + if size is not None: + size = int(size) + +- if fast: ++ if fast and skip_old_DBMD_check: + fsize = misc.stat_f(file) + if fsize is None: # File doesn't exist... + return None +@@ -1756,16 +1771,21 @@ Insufficient space in download directory %s + + try: + def checkfunc(obj): +- self.checkMD(obj, mdtype) ++ try: ++ self.checkMD(obj, mdtype) ++ except URLGrabError: ++ # Don't share MD among mirrors, in theory we could use: ++ # self._del_dl_file(local, int(thisdata.size)) ++ # ...but this is safer. ++ misc.unlink_f(obj.filename) ++ raise + self.retrieved[mdtype] = 1 + text = "%s/%s" % (self, mdtype) + if thisdata.size is None: + reget = None + else: + reget = 'simple' +- if os.path.exists(local): +- if os.stat(local).st_size >= int(thisdata.size): +- misc.unlink_f(local) ++ self._del_dl_file(local, int(thisdata.size)) + local = self._getFile(relative=remote, + local=local, + copy_local=1, +commit c148eb10b798270b3d15087433c8efb2a79a69d0 +Author: James Antill +Date: Mon Feb 18 16:17:06 2013 -0500 + + Use xattr data as well as file size for "fast checksumming". + +diff --git a/yum/yumRepo.py b/yum/yumRepo.py +index efbc42a..8c38093 100644 +--- a/yum/yumRepo.py ++++ b/yum/yumRepo.py +@@ -52,15 +52,54 @@ import stat + import errno + import tempfile + +-# If you want yum to _always_ check the MD .sqlite files then set this to +-# False (this doesn't affect .xml files or .sqilte files derived from them). +-# With this as True yum will only check when a new repomd.xml or +-# new MD is downloaded. +-# Note that with atomic MD, we can't have old MD lying around anymore so +-# the only way we need this check is if someone does something like: +-# cp primary.sqlite /var/cache/yum/blah +-# ...at which point you lose. +-skip_old_DBMD_check = True ++# This is unused now, probably nothing uses it but it was global/public. ++skip_old_DBMD_check = False ++ ++try: ++ import xattr ++ if not hasattr(xattr, 'get') or not hasattr(xattr, 'set'): ++ xattr = None # This is a "newer" API. ++except ImportError: ++ xattr = None ++ ++# The problem we are trying to solve here is that: ++# ++# 1. We rarely want to be downloading MD/pkgs/etc. ++# 2. We want to check those files are valid (match checksums) when we do ++# download them. ++# 3. We _really_ don't want to checksum all the files everytime we ++# run (100s of MBs). ++# 4. We can continue to download files from bad mirrors, or retry files due to ++# C-c etc. ++# ++# ...we used to solve this by just checking the file size, and assuming the ++# files had been downloaded and checksumed as correct if that matched. But that ++# was error prone on bad mirrors, so now we store the checksum in an ++# xattr ... this does mean that if you can't store xattrs (Eg. NFS) you will ++# rechecksum everything constantly. ++ ++def _xattr_get_chksum(filename, chktype): ++ if not xattr: ++ return None ++ ++ try: ++ ret = xattr.get(filename, 'user.yum.checksum.' + chktype) ++ except: # Documented to be "EnvironmentError", but make sure ++ return None ++ ++ return ret ++ ++def _xattr_set_chksum(filename, chktype, chksum): ++ if not xattr: ++ return None ++ ++ try: ++ xattr.set(filename, 'user.yum.checksum.' + chktype, chksum) ++ except: ++ return False # Data too long. = IOError ... ignore everything. ++ ++ return True ++ + + warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning) + +@@ -228,7 +267,7 @@ class YumPackageSack(packageSack.PackageSack): + # get rid of all this stuff we don't need now + del repo.cacheHandler + +- def _check_uncompressed_db_gen(self, repo, mdtype, fast=True): ++ def _check_uncompressed_db_gen(self, repo, mdtype): + """return file name of db in gen/ dir if good, None if not""" + + mydbdata = repo.repoXML.getData(mdtype) +@@ -238,7 +277,7 @@ class YumPackageSack(packageSack.PackageSack): + db_un_fn = mdtype + '.sqlite' + + if not repo._checkMD(compressed_fn, mdtype, data=mydbdata, +- check_can_fail=fast, fast=fast): ++ check_can_fail=True): + return None + + ret = misc.repo_gen_decompress(compressed_fn, db_un_fn, +@@ -261,8 +300,7 @@ class YumPackageSack(packageSack.PackageSack): + result = None + + if os.path.exists(db_un_fn): +- if skip_old_DBMD_check and repo._using_old_MD: +- return db_un_fn ++ + + try: + repo.checkMD(db_un_fn, mdtype, openchecksum=True) +@@ -296,7 +334,6 @@ class YumRepository(Repository, config.RepoConf): + # eventually want + self.repoMDFile = 'repodata/repomd.xml' + self._repoXML = None +- self._using_old_MD = None + self._oldRepoMDData = {} + self.cache = 0 + self.mirrorlistparsed = 0 +@@ -1407,7 +1444,6 @@ Insufficient space in download directory %s + self._revertOldRepoXML() + return False + +- self._using_old_MD = caching + if caching: + return False # Skip any work. + +@@ -1673,7 +1709,7 @@ Insufficient space in download directory %s + return self._checkMD(fn, mdtype, openchecksum) + + def _checkMD(self, fn, mdtype, openchecksum=False, +- data=None, check_can_fail=False, fast=False): ++ data=None, check_can_fail=False): + """ Internal function, use .checkMD() from outside yum. """ + + thisdata = data # So the argument name is nicer +@@ -1696,17 +1732,15 @@ Insufficient space in download directory %s + if size is not None: + size = int(size) + +- if fast and skip_old_DBMD_check: ++ l_csum = _xattr_get_chksum(file, r_ctype) ++ if l_csum: + fsize = misc.stat_f(file) +- if fsize is None: # File doesn't exist... +- return None +- if size is None: +- return 1 +- if size == fsize.st_size: +- return 1 +- if check_can_fail: +- return None +- raise URLGrabError(-1, 'Metadata file does not match size') ++ if fsize is not None: # We just got an xattr, so it should be there ++ if size is None and l_csum == r_csum: ++ return 1 ++ if size == fsize.st_size and l_csum == r_csum: ++ return 1 ++ # Anything goes wrong, run the checksums as normal... + + try: # get the local checksum + l_csum = self._checksum(r_ctype, file, datasize=size) +@@ -1716,6 +1750,7 @@ Insufficient space in download directory %s + raise URLGrabError(-3, 'Error performing checksum') + + if l_csum == r_csum: ++ _xattr_set_chksum(file, r_ctype, l_csum) + return 1 + else: + if check_can_fail: diff --git a/BZ-920758-keep-installedFileRequires-inc-sync.patch b/BZ-920758-keep-installedFileRequires-inc-sync.patch new file mode 100644 index 0000000..c0bc9be --- /dev/null +++ b/BZ-920758-keep-installedFileRequires-inc-sync.patch @@ -0,0 +1,34 @@ +diff -up yum-3.4.3/yum/depsolve.py.old yum-3.4.3/yum/depsolve.py +--- yum-3.4.3/yum/depsolve.py.old 2013-04-04 18:21:22.477786494 +0200 ++++ yum-3.4.3/yum/depsolve.py 2013-04-04 18:22:48.742547795 +0200 +@@ -918,6 +918,9 @@ class Depsolve(object): + self._last_req = None + self.pkgSack.delPackage(otxmbr.po) + self.up.delPackage(otxmbr.pkgtup) ++ # Update the cache and recheck file requires ++ (self.installedFileRequires or {}).pop(otxmbr.pkgtup, None) ++ CheckRemoves = True + + if CheckDeps: + if self.dsCallback: self.dsCallback.restartLoop() +@@ -1177,10 +1180,10 @@ class Depsolve(object): + + # get file requirements from new packages + for txmbr in self._tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES): ++ files = [] + for name, flag, evr in txmbr.po.requires: + if name.startswith('/'): +- pt = txmbr.po.pkgtup +- self.installedFileRequires.setdefault(pt, []).append(name) ++ files.append(name) + # check if file requires was already unresolved in update + if name in self.installedUnresolvedFileRequires: + already_broken = False +@@ -1194,6 +1197,7 @@ class Depsolve(object): + nfileRequires.add(name) + fileRequires.add(name) + reverselookup.setdefault(name, []).append(txmbr.po.pkgtup) ++ self.installedFileRequires[txmbr.po.pkgtup] = files + + todel = [] + for fname in self.installedFileProviders: diff --git a/BZ-927240-fix-package-download-and-verify.patch b/BZ-927240-fix-package-download-and-verify.patch new file mode 100644 index 0000000..a737ff0 --- /dev/null +++ b/BZ-927240-fix-package-download-and-verify.patch @@ -0,0 +1,44 @@ +commit fe21657d863708d48fe2ec4e056c37a1b676661c +Author: Zdeněk Pavlas +Date: Wed Nov 14 09:51:26 2012 +0100 + + can't verify package before it's downloaded + +diff --git a/yum/yumRepo.py b/yum/yumRepo.py +index 6bf520f..4f5f7a6 100644 +--- a/yum/yumRepo.py ++++ b/yum/yumRepo.py +@@ -993,7 +993,8 @@ Insufficient space in download directory %s + **kwargs + ) + +- if not package.verifyLocalPkg(): # Don't return as "success" when bad. ++ if not kwargs.get('async') and not package.verifyLocalPkg(): ++ # Don't return as "success" when bad. + msg = "Downloaded package %s, from %s, but it was invalid." + msg = msg % (package, package.repo.id) + raise Errors.RepoError, msg + +downloadPkgs: skip duplicated packages + +diff -up yum-3.4.3/yum/__init__.py.old yum-3.4.3/yum/__init__.py +--- yum-3.4.3/yum/__init__.py.old 2013-03-25 14:45:17.125277817 +0100 ++++ yum-3.4.3/yum/__init__.py 2013-03-25 14:48:31.158718960 +0100 +@@ -2226,11 +2226,17 @@ much more problems). + repo_cached = False + remote_pkgs = [] + remote_size = 0 ++ beenthere = set() # only once, please. BZ 468401 + for po in pkglist: + if hasattr(po, 'pkgtype') and po.pkgtype == 'local': + continue + + local = po.localPkg() ++ if local in beenthere: ++ # This is definitely a depsolver bug. Make it fatal? ++ self.verbose_logger.warn(_("ignoring a dupe of %s") % po) ++ continue ++ beenthere.add(local) + if os.path.exists(local): + if not self.verifyPkg(local, po, False): + if po.repo.cache: diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 05b65b1..6aba05e 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -96,7 +96,7 @@ index 2f6154e..2e5a052 100644 diff --git a/cli.py b/cli.py old mode 100644 new mode 100755 -index 6056d38..c7d89a1 +index 6056d38..4122d5d --- a/cli.py +++ b/cli.py @@ -25,7 +25,7 @@ import sys @@ -384,13 +384,12 @@ index 6056d38..c7d89a1 stuff_to_download = True po = txmbr.po if po: -@@ -489,9 +536,21 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -489,9 +536,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): else: self.reportDownloadSize(downloadpkgs, install_only) + cfr = self.tsInfo._check_future_rpmdbv + if (cfr is not None and -+ cfr[0] == self.tsInfo.state_counter and + self.tsInfo.futureRpmDBVersion() != cfr[1]): + msg = _("future rpmdb ver mismatched saved transaction version,") + if cfr[2]: @@ -407,7 +406,7 @@ index 6056d38..c7d89a1 self.verbose_logger.info(_('Exiting on user Command')) return -1 -@@ -609,12 +668,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -609,12 +667,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return resultobject.return_code def gpgsigcheck(self, pkgs): @@ -427,7 +426,7 @@ index 6056d38..c7d89a1 for po in pkgs: result, errmsg = self.sigCheckPkg(po) -@@ -623,7 +684,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -623,7 +683,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput): continue elif result == 1: @@ -437,7 +436,7 @@ index 6056d38..c7d89a1 raise yum.Errors.YumBaseError, \ _('Refusing to automatically import keys when running ' \ 'unattended.\nUse "-y" to override.') -@@ -691,12 +753,62 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -691,12 +752,62 @@ class YumBaseCli(yum.YumBase, output.YumOutput): ", ".join(matches)) self.verbose_logger.log(yum.logginglevels.INFO_2, msg) @@ -506,7 +505,7 @@ index 6056d38..c7d89a1 # get the list of available packages # iterate over the user's list # add packages to Transaction holding class if they match. -@@ -710,11 +822,36 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -710,11 +821,36 @@ class YumBaseCli(yum.YumBase, output.YumOutput): for arg in userlist: if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or os.path.exists(arg))): @@ -545,7 +544,7 @@ index 6056d38..c7d89a1 except yum.Errors.InstallError: self.verbose_logger.log(yum.logginglevels.INFO_2, _('No package %s%s%s available.'), -@@ -723,6 +860,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -723,6 +859,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): self._maybeYouMeant(arg) else: done = True @@ -553,7 +552,7 @@ index 6056d38..c7d89a1 if len(self.tsInfo) > oldcount: change = len(self.tsInfo) - oldcount return 2, [P_('%d package to install', '%d packages to install', change) % change] -@@ -732,9 +870,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -732,9 +869,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('Nothing to do')] def updatePkgs(self, userlist, quiet=0, update_to=False): @@ -584,7 +583,7 @@ index 6056d38..c7d89a1 # if there is no userlist, then do global update below # this is probably 90% of the calls # if there is a userlist then it's for updating pkgs, not obsoleting -@@ -745,21 +901,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -745,21 +900,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput): else: # go through the userlist - look for items that are local rpms. If we find them @@ -615,7 +614,7 @@ index 6056d38..c7d89a1 if len(self.tsInfo) > oldcount: change = len(self.tsInfo) - oldcount -@@ -770,9 +923,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -770,9 +922,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): # Note that we aren't in __init__ yet for a couple of reasons, but we # probably will get there for 3.2.28. def distroSyncPkgs(self, userlist): @@ -643,7 +642,7 @@ index 6056d38..c7d89a1 level = 'diff' if userlist and userlist[0] in ('full', 'diff', 'different'): -@@ -831,6 +999,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -831,6 +998,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): continue nayi = napkg.yumdb_info @@ -651,7 +650,7 @@ index 6056d38..c7d89a1 for apkg in self.pkgSack.searchPkgTuple(napkg.pkgtup): if ('checksum_type' in nayi and 'checksum_data' in nayi and -@@ -865,15 +1034,54 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -865,15 +1033,54 @@ class YumBaseCli(yum.YumBase, output.YumOutput): else: return 0, [_('No Packages marked for Distribution Synchronization')] @@ -712,7 +711,7 @@ index 6056d38..c7d89a1 if not rms: self._checkMaybeYouMeant(arg, always_output=False, rpmdb_only=True) all_rms.extend(rms) -@@ -884,12 +1092,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -884,12 +1091,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('No Packages marked for removal')] def downgradePkgs(self, userlist): @@ -740,7 +739,7 @@ index 6056d38..c7d89a1 for arg in userlist: if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or os.path.exists(arg))): -@@ -905,26 +1125,44 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -905,26 +1124,44 @@ class YumBaseCli(yum.YumBase, output.YumOutput): self.term.MODE['bold'], arg, self.term.MODE['normal']) self._maybeYouMeant(arg) @@ -789,7 +788,7 @@ index 6056d38..c7d89a1 except yum.Errors.ReinstallRemoveError: self._checkMaybeYouMeant(arg, always_output=False) except yum.Errors.ReinstallInstallError, e: -@@ -940,15 +1178,31 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -940,15 +1177,31 @@ class YumBaseCli(yum.YumBase, output.YumOutput): except yum.Errors.ReinstallError, e: assert False, "Shouldn't happen, but just in case" self.verbose_logger.log(yum.logginglevels.INFO_2, e) @@ -824,7 +823,7 @@ index 6056d38..c7d89a1 # read in each package into a YumLocalPackage Object # append it to self.localPackages # check if it can be installed or updated based on nevra versus rpmdb -@@ -972,20 +1226,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -972,20 +1225,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [_('Nothing to do')] def returnPkgLists(self, extcmds, installed_available=False): @@ -864,7 +863,7 @@ index 6056d38..c7d89a1 special = ['available', 'installed', 'all', 'extras', 'updates', 'recent', 'obsoletes'] -@@ -1017,8 +1276,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1017,8 +1275,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return ypl def search(self, args): @@ -892,7 +891,7 @@ index 6056d38..c7d89a1 # call the yum module search function with lists of tags to search # and what to search for -@@ -1108,9 +1384,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1108,9 +1383,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, matching def deplist(self, args): @@ -915,7 +914,7 @@ index 6056d38..c7d89a1 pkgs = [] for arg in args: if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or -@@ -1131,10 +1418,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1131,10 +1417,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [] def provides(self, args): @@ -939,7 +938,7 @@ index 6056d38..c7d89a1 old_sdup = self.conf.showdupesfromrepos # For output, as searchPackageProvides() is always in showdups mode self.conf.showdupesfromrepos = True -@@ -1147,6 +1443,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1147,6 +1442,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput): paths = set(sys.path + os.environ['PATH'].split(':')) nargs = [] for arg in args: @@ -948,7 +947,7 @@ index 6056d38..c7d89a1 if yum.misc.re_filename(arg) or yum.misc.re_glob(arg): continue for path in paths: -@@ -1163,20 +1461,77 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1163,20 +1460,77 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 0, [] def resolveDepCli(self, args): @@ -1031,7 +1030,7 @@ index 6056d38..c7d89a1 hdrcode = pkgcode = xmlcode = dbcode = expccode = 0 pkgresults = hdrresults = xmlresults = dbresults = expcresults = [] msg = self.fmtKeyValFill(_('Cleaning repos: '), -@@ -1228,130 +1583,257 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1228,130 +1582,257 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return code, [] def returnGroupLists(self, userlist): @@ -1369,7 +1368,7 @@ index 6056d38..c7d89a1 except yum.Errors.GroupsError: self.logger.critical(_('Warning: Group %s does not exist.'), group_string) continue -@@ -1368,17 +1850,61 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1368,17 +1849,61 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return 2, [P_('%d package to Install', '%d packages to Install', len(pkgs_used)) % len(pkgs_used)] def removeGroups(self, grouplist): @@ -1439,7 +1438,7 @@ index 6056d38..c7d89a1 if not pkgs_used: return 0, [_('No packages to remove from groups')] -@@ -1389,7 +1915,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1389,7 +1914,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): def _promptWanted(self): # shortcut for the always-off/always-on options @@ -1448,7 +1447,7 @@ index 6056d38..c7d89a1 return False if self.conf.alwaysprompt: return True -@@ -1400,7 +1926,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1400,7 +1925,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput): # package wasn't explictly given on the command line for txmbr in self.tsInfo.getMembers(): if txmbr.isDep or \ @@ -1456,7 +1455,7 @@ index 6056d38..c7d89a1 txmbr.name not in self.extcmds: return True -@@ -1408,11 +1933,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1408,11 +1932,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return False def usage(self): @@ -1470,7 +1469,7 @@ index 6056d38..c7d89a1 sys.stdout.write(self.optparser.get_usage()) def _installable(self, pkg, ematch=False): -@@ -1468,9 +1993,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput): +@@ -1468,9 +1992,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput): return False class YumOptionParser(OptionParser): @@ -1482,7 +1481,7 @@ index 6056d38..c7d89a1 def __init__(self,base, **kwargs): # check if this is called with a utils=True/False parameter -@@ -1488,13 +2013,23 @@ class YumOptionParser(OptionParser): +@@ -1488,13 +2012,23 @@ class YumOptionParser(OptionParser): self._addYumBasicOptions() def error(self, msg): @@ -1508,7 +1507,7 @@ index 6056d38..c7d89a1 try: args = _filtercmdline( ('--noplugins','--version','-q', '-v', "--quiet", "--verbose"), -@@ -1521,7 +2056,15 @@ class YumOptionParser(OptionParser): +@@ -1521,7 +2055,15 @@ class YumOptionParser(OptionParser): return ret def setupYumConfig(self, args=None): @@ -1525,7 +1524,7 @@ index 6056d38..c7d89a1 if not args: (opts, cmds) = self.parse_args() else: -@@ -1533,16 +2076,20 @@ class YumOptionParser(OptionParser): +@@ -1533,16 +2075,22 @@ class YumOptionParser(OptionParser): try: # config file is parsed and moving us forward # set some things in it. @@ -1536,13 +1535,16 @@ index 6056d38..c7d89a1 # Handle remaining options if opts.assumeyes: - self.base.conf.assumeyes =1 -+ self.base.conf.assumeyes = 1 -+ if opts.assumeno: -+ self.base.conf.assumeno = 1 - +- - # Instead of going cache-only for a non-root user, try to use a - # user writable cachedir. If that fails fall back to cache-only. - if opts.cacheonly: ++ self.base.conf.assumeyes = 1 ++ if opts.assumeno: ++ self.base.conf.assumeno = 1 ++ self.base.conf.downloadonly = opts.dlonly ++ self.base.conf.downloaddir = opts.dldir ++ + # Treat users like root as much as possible: + if not self.base.setCacheDir(): self.base.conf.cache = 1 @@ -1551,7 +1553,7 @@ index 6056d38..c7d89a1 self.base.conf.cache = 1 if opts.obsoletes: -@@ -1610,10 +2157,6 @@ class YumOptionParser(OptionParser): +@@ -1610,10 +2158,6 @@ class YumOptionParser(OptionParser): self.base.usage() sys.exit(1) @@ -1562,7 +1564,7 @@ index 6056d38..c7d89a1 # Disable all gpg key checking, if requested. if opts.nogpgcheck: # Altering the normal configs. doesn't work too well, esp. with -@@ -1640,6 +2183,14 @@ class YumOptionParser(OptionParser): +@@ -1640,10 +2184,18 @@ class YumOptionParser(OptionParser): sys.exit(1) def getRoot(self,opts): @@ -1577,7 +1579,22 @@ index 6056d38..c7d89a1 self._checkAbsInstallRoot(opts) # If the conf file is inside the installroot - use that. # otherwise look for it in the normal root -@@ -1713,6 +2264,10 @@ class YumOptionParser(OptionParser): +- if opts.installroot: ++ if opts.installroot and opts.installroot.lstrip('/'): + if os.access(opts.installroot+'/'+opts.conffile, os.R_OK): + opts.conffile = opts.installroot+'/'+opts.conffile + elif opts.conffile == '/etc/yum/yum.conf': +@@ -1701,6 +2253,9 @@ class YumOptionParser(OptionParser): + group.add_option("--showduplicates", dest="showdupesfromrepos", + action="store_true", + help=_("show duplicates, in repos, in list/search commands")) ++ group.add_option("--show-duplicates", dest="showdupesfromrepos", ++ action="store_true", ++ help=SUPPRESS_HELP) + group.add_option("-e", "--errorlevel", dest="errorlevel", default=None, + help=_("error output level"), type='int', + metavar='[error level]') +@@ -1713,6 +2268,10 @@ class YumOptionParser(OptionParser): help=_("verbose operation")) group.add_option("-y", "--assumeyes", dest="assumeyes", action="store_true", help=_("answer yes for all questions")) @@ -1588,9 +1605,20 @@ index 6056d38..c7d89a1 group.add_option("--version", action="store_true", help=_("show Yum version and exit")) group.add_option("--installroot", help=_("set install root"), +@@ -1748,6 +2307,10 @@ class YumOptionParser(OptionParser): + help=_("control whether color is used")) + group.add_option("", "--releasever", dest="releasever", default=None, + help=_("set value of $releasever in yum config and repo files")) ++ group.add_option("--downloadonly", dest="dlonly", action="store_true", ++ help=_("don't update, just download")) ++ group.add_option("--downloaddir", dest="dldir", default=None, ++ help=_("specifies an alternate directory to store packages")) + group.add_option("", "--setopt", dest="setopts", default=[], + action="append", help=_("set arbitrary config and repo options")) + diff --git a/completion-helper.py b/completion-helper.py new file mode 100755 -index 0000000..0e4b96b +index 0000000..05801d1 --- /dev/null +++ b/completion-helper.py @@ -0,0 +1,90 @@ @@ -1619,7 +1647,7 @@ index 0000000..0e4b96b + +import cli +import yumcommands -+from yum.Errors import GroupsError ++from yum.Errors import GroupsError, ConfigError + + +class GroupsCompletionCommand(yumcommands.GroupsCommand): @@ -1672,11 +1700,11 @@ index 0000000..0e4b96b + base.registerCommand(RepoListCompletionCommand()) + base.getOptionsConfig(args) + base.parseCommands() -+ for repo in base.repos.listEnabled(): -+ repo.skip_if_unavailable = True + try: ++ for repo in base.repos.listEnabled(): ++ repo.skip_if_unavailable = True + base.doCommands() -+ except GroupsError, e: ++ except (GroupsError, ConfigError), e: + base.logger.error(e) + +if __name__ == "__main__": @@ -2283,7 +2311,7 @@ index 0000000..d2a0ed1 +if __name__ == "__main__": + generateAll(os.getcwd(), os.getcwd()) diff --git a/docs/yum.8 b/docs/yum.8 -index 1a8202a..15a8345 100644 +index 1a8202a..65ff448 100644 --- a/docs/yum.8 +++ b/docs/yum.8 @@ -52,6 +52,7 @@ gnome\-packagekit application\&. @@ -2294,8 +2322,12 @@ index 1a8202a..15a8345 100644 .br .I \fR * localinstall rpmfile1 [rpmfile2] [\&.\&.\&.] (maintained for legacy reasons only - use install) -@@ -69,7 +70,9 @@ gnome\-packagekit application\&. +@@ -67,9 +68,13 @@ gnome\-packagekit application\&. .br + .I \fR * repolist [all|enabled|disabled] + .br ++.I \fR * repoinfo [all|enabled|disabled] ++.br .I \fR * version [ all | installed | available | group-* | nogroups* | grouplist | groupinfo ] .br -.I \fR * history [info|list|packages-list|summary|addon-info|redo|undo|rollback|new] @@ -2305,7 +2337,7 @@ index 1a8202a..15a8345 100644 .br .I \fR * check .br -@@ -86,14 +89,20 @@ Is used to install the latest version of a package or +@@ -86,14 +91,20 @@ Is used to install the latest version of a package or group of packages while ensuring that all dependencies are satisfied\&. (See \fBSpecifying package names\fP for more information) If no package matches the given package name(s), they are assumed to be a shell @@ -2330,7 +2362,7 @@ index 1a8202a..15a8345 100644 .IP .IP "\fBupdate\fP" If run without any packages, update will update every currently -@@ -111,7 +120,7 @@ changes, for example: upgrading from somelinux 8.0 to somelinux 9. +@@ -111,7 +122,7 @@ changes, for example: upgrading from somelinux 8.0 to somelinux 9. Note that "\fBupdate\fP" works on installed packages first, and only if there are no matches does it look for available packages. The difference is most @@ -2339,7 +2371,7 @@ index 1a8202a..15a8345 100644 "\fBupdate\fP foo" if foo-1-2 is installed. You can use the "\fBupdate-to\fP" if you'd prefer that nothing happen in the above case. .IP -@@ -158,6 +167,11 @@ the "install" command\&.(See \fBSpecifying package names\fP for more information +@@ -158,6 +169,11 @@ the "install" command\&.(See \fBSpecifying package names\fP for more information Note that "yum" is included in the protected_packages configuration, by default. So you can't accidentally remove yum itself. @@ -2351,7 +2383,7 @@ index 1a8202a..15a8345 100644 .IP .IP "\fBlist\fP" Is used to list various information about available -@@ -209,10 +223,12 @@ installed. +@@ -209,10 +225,12 @@ installed. "\fBgroup list\fP" is used to list the available groups from all \fByum\fP repos. Groups are marked as "installed" if all mandatory packages are installed, or if a group doesn't have any mandatory packages then it is installed if any of the optional or @@ -2368,7 +2400,7 @@ index 1a8202a..15a8345 100644 "\fBgroup remove\fP" is used to remove all of the packages in a group, unlike "groupinstall" this will remove everything regardless of group_package_types. It is worth pointing -@@ -224,10 +240,37 @@ to only remove packages which aren't required by something else. +@@ -224,10 +242,37 @@ to only remove packages which aren't required by something else. "\fBgroup info\fP" is used to give the description and package list of a group (and which type those packages are marked as). Note that you can use the yum-filter-data and @@ -2407,7 +2439,7 @@ index 1a8202a..15a8345 100644 .IP .IP "\fBshell\fP" Is used to enter the 'yum shell', when a filename is specified the contents of -@@ -235,12 +278,13 @@ that file is executed in yum shell mode. See \fIyum-shell(8)\fP for more info +@@ -235,12 +280,13 @@ that file is executed in yum shell mode. See \fIyum-shell(8)\fP for more info .IP .IP "\fBresolvedep\fP" Is used to list packages providing the specified dependencies, at most one @@ -2423,7 +2455,7 @@ index 1a8202a..15a8345 100644 reasons only. .IP .IP "\fBlocalupdate\fP" -@@ -248,7 +292,7 @@ Is used to update the system by specifying local rpm files. Only the specified +@@ -248,7 +294,7 @@ Is used to update the system by specifying local rpm files. Only the specified rpm files of which an older version is already installed will be installed, the remaining specified packages will be ignored. If required the enabled repositories will be used to resolve dependencies. Note @@ -2432,7 +2464,7 @@ index 1a8202a..15a8345 100644 legacy reasons only. .IP .IP "\fBreinstall\fP" -@@ -260,7 +304,7 @@ on groups, files, provides and filelists just like the "install" command\&. +@@ -260,7 +306,7 @@ on groups, files, provides and filelists just like the "install" command\&. Will try and downgrade a package from the version currently installed to the previously highest version (or the specified version). The depsolver will not necessarily work, but if you specify all the packages it @@ -2441,7 +2473,14 @@ index 1a8202a..15a8345 100644 work for "installonly" packages, like Kernels. downgrade operates on groups, files, provides, filelists and rpm files just like the "install" command\&. .IP -@@ -294,8 +338,8 @@ package counts/etc. will be zeroed out). +@@ -291,11 +337,15 @@ then yum will ignore any repo errors and output the information it can get + (Eg. "yum clean all; yum -C repolist" will output something, although the + package counts/etc. will be zeroed out). + .IP ++.IP "\fBrepoinfo\fP" ++.IP ++This ocmmand works exactly like repolist -v. ++.IP .IP "\fBversion\fP" Produces a "version" of the rpmdb, and of the enabled repositories if "all" is given as the first argument. You can also specify version groups in the @@ -2452,7 +2491,7 @@ index 1a8202a..15a8345 100644 packages (in sorted order), and the checksum_type/checksum_data entries from the yumdb. Note that this rpmdb version is now also used significantly within yum (esp. in yum history). -@@ -321,26 +365,33 @@ and so takes sub-commands: +@@ -321,26 +371,33 @@ and so takes sub-commands: .IP "\fBhistory\fP" The history command allows the user to view what has happened in past transactions (assuming the history_record config. option is set). You can use @@ -2492,7 +2531,7 @@ index 1a8202a..15a8345 100644 A (if it is not still installed), and "rollback 1" will try to remove packages B and C. Note that after a "rollback 1" you will have a fourth transaction, although the ending rpmdb version (see: yum version) should be the same in -@@ -349,6 +400,12 @@ transactions 1 and 4. +@@ -349,6 +406,12 @@ transactions 1 and 4. The addon-info command takes a transaction ID, and the packages-list command takes a package (with wildcards). @@ -2505,7 +2544,7 @@ index 1a8202a..15a8345 100644 In "history list" you can change the behaviour of the 2nd column via. the configuration option history_list_view. -@@ -371,6 +428,15 @@ end of the package column in the packages-list command). +@@ -371,6 +434,15 @@ end of the package column in the packages-list command). .I \fBs\fR - The transaction completed fine, but --skip-broken was enabled and had to skip some packages. .br @@ -2521,7 +2560,7 @@ index 1a8202a..15a8345 100644 .IP .IP "\fBcheck\fP" Checks the local rpmdb and produces information on any problems it finds. You -@@ -401,6 +467,11 @@ Assume yes; assume that the answer to any question which would be asked +@@ -401,6 +473,11 @@ Assume yes; assume that the answer to any question which would be asked is yes\&. .br Configuration Option: \fBassumeyes\fP @@ -2533,7 +2572,7 @@ index 1a8202a..15a8345 100644 .IP "\fB\-c, \-\-config=[config file]\fP" Specifies the config file location - can take HTTP and FTP URLs and local file paths\&. -@@ -420,7 +491,7 @@ Sets the error level to [number] Practical range 0 \- 10. 0 means print only cri +@@ -420,7 +497,7 @@ Sets the error level to [number] Practical range 0 \- 10. 0 means print only cri .br Configuration Option: \fBerrorlevel\fP .IP "\fB\-\-rpmverbosity=[name]\fP" @@ -2542,18 +2581,24 @@ index 1a8202a..15a8345 100644 options are: 'critical', 'emergency', 'error', 'warn' and 'debug'. .br Configuration Option: \fBrpmverbosity\fP -@@ -506,7 +577,8 @@ option will corrupt your cache (and you can use $releasever in your cachedir +@@ -506,7 +583,14 @@ option will corrupt your cache (and you can use $releasever in your cachedir configuration to stop this). .PP .IP "\fB\-t, \-\-tolerant\fP" -This option currently does nothing. +This option makes yum go slower, checking for things that shouldn't be possible +making it more tolerant of external errors. ++.br ++.IP "\fB\-\-downloadonly\fP" ++Don't update, just download. ++.br ++.IP "\fB\-\-downloaddir=directory\fP" ++Specifies an alternate directory to store packages. .br .IP "\fB\-\-setopt=option=value\fP" Set any config option in yum config or repo files. For options in the global diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 -index 515aa73..b456074 100644 +index 515aa73..029fa75 100644 --- a/docs/yum.conf.5 +++ b/docs/yum.conf.5 @@ -114,15 +114,27 @@ are causing problems from the transaction. @@ -2665,7 +2710,27 @@ index 515aa73..b456074 100644 \fBhistory_record \fR Boolean - should yum record history entries for transactions. This takes some disk space, and some extra time in the transactions. But it allows how to know a -@@ -593,8 +654,50 @@ See color_list_installed_older for possible values. +@@ -480,6 +541,19 @@ not listed above is the other metadata, which contains the changelog information + which is used by yum-changelog. This is what "yum makecache" uses. + + .IP ++\fBmddownloadpolicy \fR ++You can select which kinds of repodata you would prefer yum to download: ++ ++`sqlite' - Download the .sqlite files, if available. This is currently slightly ++faster, once they are downloaded. However these files tend to be bigger, and ++thus. take longer to download. ++ ++`sqlite' - Download the .XML files, which yum will do anyway as a fallback on ++the other options. These files tend to be smaller, but they require ++parsing/converting locally after download and some aditional checks are ++performed on them each time they are used. ++ ++.IP + \fBmultilib_policy \fR + Can be set to 'all' or 'best'. All means install all possible arches for any package you + want to install. Therefore yum install foo will install foo.i386 and foo.x86_64 on x86_64, +@@ -593,8 +667,53 @@ See color_list_installed_older for possible values. When removing packages (by removal, update or obsoletion) go through each package's dependencies. If any of them are no longer required by any other package then also mark them to be removed. @@ -2698,12 +2763,15 @@ index 515aa73..b456074 100644 +Should the load-ts command ignore packages that are missing. This includes +packages in the TS to be removed, which aren't installed, and packages in the +TS to be added, which aren't available. ++If this is set to true, and an rpm is missing then loadts_ignorenewrpm is ++automatically set to true. +Boolean (1, 0, True, False, yes, no) Defaults to False + +.IP +\fBloadts_ignorerpm\fR +Should the load-ts command ignore the rpmdb version (yum version nogroups) or +abort if there is a mismatch between the TS file and the current machine. ++If this is set to true, then loadts_ignorenewrpm is automatically set to true. +Boolean (1, 0, True, False, yes, no) Defaults to False + +.IP @@ -2716,7 +2784,7 @@ index 515aa73..b456074 100644 .SH "[repository] OPTIONS" -@@ -755,6 +858,11 @@ repository. +@@ -755,6 +874,11 @@ repository. Overrides the \fBbandwidth\fR option from the [main] section for this repository. @@ -2728,7 +2796,7 @@ index 515aa73..b456074 100644 .IP \fBsslcacert \fR -@@ -776,6 +884,10 @@ repository. +@@ -776,6 +900,10 @@ repository. Overrides the \fBsslclientkey\fR option from the [main] section for this repository. @@ -2739,7 +2807,7 @@ index 515aa73..b456074 100644 .IP \fBmetadata_expire \fR -@@ -824,7 +936,11 @@ as greater/less than any other. defaults to 1000 +@@ -824,7 +952,11 @@ as greater/less than any other. defaults to 1000 If set to True yum will continue running if this repository cannot be contacted for any reason. This should be set carefully as all repos are consulted for any given command. Defaults to False. @@ -3105,7 +3173,7 @@ index c60fa08..0000000 -ts run -exit diff --git a/etc/yum.bash b/etc/yum.bash -index f1e06e8..b21c594 100644 +index f1e06e8..d484f8d 100644 --- a/etc/yum.bash +++ b/etc/yum.bash @@ -1,53 +1,17 @@ @@ -3179,16 +3247,20 @@ index f1e06e8..b21c594 100644 COMPREPLY+=( $( compgen -W '$( command grep -il "^\s*enabled\s*=\s*$val" \ /etc/yum/pluginconf.d/*.conf 2>/dev/null \ | sed -ne "s|^.*/\([^/]\{1,\}\)\.conf$|\1|p" )' -- "$2" ) ) -@@ -75,7 +39,7 @@ _yum_baseopts() +@@ -75,9 +39,10 @@ _yum_baseopts() { local opts='--help --tolerant --cacheonly --config --randomwait --debuglevel --showduplicates --errorlevel --rpmverbosity --quiet - --verbose --assumeyes --version --installroot --enablerepo + --verbose --assumeyes --assumeno --version --installroot --enablerepo --disablerepo --exclude --disableexcludes --obsoletes --noplugins - --nogpgcheck --skip-broken --color --releasever --setopt' +- --nogpgcheck --skip-broken --color --releasever --setopt' ++ --nogpgcheck --skip-broken --color --releasever --setopt --downloadonly ++ --downloaddir' [[ $COMP_LINE == *--noplugins* ]] || \ -@@ -89,6 +53,16 @@ _yum_transactions() + opts+=" --disableplugin --enableplugin" + printf %s "$opts" +@@ -89,6 +54,16 @@ _yum_transactions() sed -ne 's/^[[:space:]]*\([0-9]\{1,\}\).*/\1/p' )" -- "$cur" ) ) } @@ -3205,7 +3277,7 @@ index f1e06e8..b21c594 100644 # arguments: # 1 = current word to be completed # 2 = previous word -@@ -119,17 +93,17 @@ _yum_complete_baseopts() +@@ -119,17 +94,17 @@ _yum_complete_baseopts() ;; --enablerepo) @@ -3226,7 +3298,7 @@ index f1e06e8..b21c594 100644 COMPREPLY=( $( compgen -W '${COMPREPLY[@]} all main' -- "$1" ) ) return 0 ;; -@@ -183,16 +157,16 @@ _yum() +@@ -183,16 +158,16 @@ _yum() # Commands offered as completions local cmds=( check check-update clean deplist distro-sync downgrade @@ -3247,7 +3319,7 @@ index f1e06e8..b21c594 100644 [[ ${words[i]} == $c ]] && cmd=$c && break done done -@@ -205,13 +179,12 @@ _yum() +@@ -205,13 +180,12 @@ _yum() return 0 ;; @@ -3263,7 +3335,7 @@ index f1e06e8..b21c594 100644 COMPREPLY=( $( compgen -W 'expire-cache packages headers metadata cache dbcache all' -- "$cur" ) ) return 0 -@@ -224,59 +197,83 @@ _yum() +@@ -224,59 +198,83 @@ _yum() ;; distro-sync|distribution-synchronization) @@ -3363,7 +3435,7 @@ index f1e06e8..b21c594 100644 ;; esac return 0 -@@ -288,42 +285,56 @@ _yum() +@@ -288,42 +286,56 @@ _yum() ;; install) @@ -3427,7 +3499,7 @@ index f1e06e8..b21c594 100644 COMPREPLY=( $( compgen -W 'all installed available nogroups grouplist groupinfo' -- "$cur" ) ) return 0 -@@ -337,7 +348,11 @@ _yum() +@@ -337,7 +349,11 @@ _yum() $split && return 0 @@ -3441,7 +3513,7 @@ index f1e06e8..b21c594 100644 complete -F _yum -o filenames yum yummain.py diff --git a/output.py b/output.py -index b6aa277..caac21a 100755 +index b6aa277..05b255e 100755 --- a/output.py +++ b/output.py @@ -1,6 +1,6 @@ @@ -3871,6 +3943,15 @@ index b6aa277..caac21a 100755 (hibeg, hiend) = self._highlight(highlight) print _("Name : %s%s%s") % (hibeg, to_unicode(pkg.name), hiend) print _("Arch : %s") % to_unicode(pkg.arch) +@@ -585,7 +820,7 @@ class YumOutput: + print _("Version : %s") % to_unicode(pkg.version) + print _("Release : %s") % to_unicode(pkg.release) + print _("Size : %s") % self.format_number(float(pkg.size)) +- print _("Repo : %s") % to_unicode(pkg.repoid) ++ print _("Repo : %s") % to_unicode(pkg.repo.ui_id) + if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info: + print _("From repo : %s") % to_unicode(pkg.yumdb_info.from_repo) + if self.verbose_logger.isEnabledFor(logginglevels.DEBUG_3): @@ -617,9 +852,22 @@ class YumOutput: print "" @@ -151048,10 +151129,10 @@ index 1ce4720..25e3022 gobject.threads_init() dbus.glib.threads_init() diff --git a/yum.spec b/yum.spec -index abd203f..65c62a9 100644 +index abd203f..4ad6804 100644 --- a/yum.spec +++ b/yum.spec -@@ -1,24 +1,51 @@ +@@ -1,24 +1,53 @@ -Summary: RPM installer/updater +%define move_yum_conf_back 1 +%define auto_sitelib 1 @@ -151105,11 +151186,13 @@ index abd203f..65c62a9 100644 Requires: yum-metadata-parser >= 1.1.0 -Requires: python-iniparse Requires: pygpgme ++# rawhide is >= 0.5.3-7.fc18 ... as this is added. ++Requires: pyliblzma + Conflicts: rpm >= 5-0 # Zif is a re-implementation of yum in C, however: # -@@ -34,18 +61,26 @@ Conflicts: rpm >= 5-0 +@@ -34,18 +63,28 @@ Conflicts: rpm >= 5-0 # zif experts). # # ...so we have two sane choices: i) Conflict with it. 2) Stop developing yum. @@ -151138,12 +151221,14 @@ index abd203f..65c62a9 100644 +Provides: yum-protect-packages = 1.1.27-0.yum +Provides: yum-plugin-protect-packages = 1.1.27-0.yum +Obsoletes: yum-plugin-download-order <= 0.2-2 ++Obsoletes: yum-plugin-downloadonly <= 1.1.31-6.fc19 ++Provides: yum-plugin-downloadonly = 3.4.3-44.yum +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description Yum is a utility that can check for and automatically download and -@@ -58,9 +93,11 @@ Group: Applications/System +@@ -58,9 +97,11 @@ Group: Applications/System Requires: yum = %{version}-%{release} Requires: dbus-python Requires: pygobject2 @@ -151157,7 +151242,7 @@ index abd203f..65c62a9 100644 Requires(postun): /sbin/service -@@ -83,18 +120,46 @@ Requires(postun): /sbin/service +@@ -83,18 +124,46 @@ Requires(postun): /sbin/service These are the files needed to run yum updates as a cron job. Install this package if you want auto yum updates nightly via cron. @@ -151206,7 +151291,7 @@ index abd203f..65c62a9 100644 # Ghost files: mkdir -p $RPM_BUILD_ROOT/var/lib/yum/history -@@ -102,12 +167,18 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins +@@ -102,12 +171,18 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins mkdir -p $RPM_BUILD_ROOT/var/lib/yum/yumdb touch $RPM_BUILD_ROOT/var/lib/yum/uuid @@ -151225,7 +151310,7 @@ index abd203f..65c62a9 100644 %post updatesd /sbin/chkconfig --add yum-updatesd /sbin/service yum-updatesd condrestart >/dev/null 2>&1 -@@ -119,6 +190,7 @@ if [ $1 = 0 ]; then +@@ -119,6 +194,7 @@ if [ $1 = 0 ]; then /sbin/service yum-updatesd stop >/dev/null 2>&1 fi exit 0 @@ -151233,7 +151318,7 @@ index abd203f..65c62a9 100644 %post cron -@@ -165,21 +237,30 @@ exit 0 +@@ -165,21 +241,30 @@ exit 0 %files -f %{name}.lang @@ -151269,7 +151354,7 @@ index abd203f..65c62a9 100644 %dir /var/cache/yum %dir /var/lib/yum %ghost /var/lib/yum/uuid -@@ -188,20 +269,24 @@ exit 0 +@@ -188,20 +273,24 @@ exit 0 %ghost /var/lib/yum/yumdb %{_mandir}/man*/yum.* %{_mandir}/man*/yum-shell* @@ -151301,7 +151386,7 @@ index abd203f..65c62a9 100644 %files updatesd %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/yum-updatesd.conf -@@ -210,8 +295,12 @@ exit 0 +@@ -210,8 +299,12 @@ exit 0 %{_datadir}/yum-cli/yumupd.py* %{_sbindir}/yum-updatesd %{_mandir}/man*/yum-updatesd* @@ -151342,10 +151427,18 @@ index c1af4ad..e3e3956 100644 pass diff --git a/yum/__init__.py b/yum/__init__.py -index 99039e0..198dc6d 100644 +index 99039e0..604ccce 100644 --- a/yum/__init__.py +++ b/yum/__init__.py -@@ -46,8 +46,13 @@ import operator +@@ -21,6 +21,7 @@ The Yum RPM software updater. + import os + import os.path + import rpm ++import sys + + def _rpm_ver_atleast(vertup): + """ Check if rpm is at least the current vertup. Can return False/True/None +@@ -46,8 +47,13 @@ import operator import tempfile import yum.i18n @@ -151361,7 +151454,7 @@ index 99039e0..198dc6d 100644 import config from config import ParsingError, ConfigParser -@@ -73,6 +78,7 @@ import logginglevels +@@ -73,6 +79,7 @@ import logginglevels import yumRepo import callbacks import yum.history @@ -151369,7 +151462,7 @@ index 99039e0..198dc6d 100644 import warnings warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning) -@@ -82,7 +88,7 @@ from packages import YumAvailablePackage, YumLocalPackage, YumInstalledPackage +@@ -82,7 +89,7 @@ from packages import YumAvailablePackage, YumLocalPackage, YumInstalledPackage from packages import YumUrlPackage, YumNotFoundPackage from constants import * from yum.rpmtrans import RPMTransaction,SimpleCliCallBack @@ -151378,7 +151471,7 @@ index 99039e0..198dc6d 100644 import string import StringIO -@@ -102,10 +108,12 @@ default_grabber.opts.user_agent += " yum/" + __version__ +@@ -102,10 +109,12 @@ default_grabber.opts.user_agent += " yum/" + __version__ class _YumPreBaseConf: @@ -151395,7 +151488,7 @@ index 99039e0..198dc6d 100644 def __init__(self): self.fn = '/etc/yum/yum.conf' self.root = '/' -@@ -125,12 +133,15 @@ class _YumPreBaseConf: +@@ -125,12 +134,15 @@ class _YumPreBaseConf: class _YumPreRepoConf: @@ -151415,7 +151508,7 @@ index 99039e0..198dc6d 100644 self.callback = None self.failure_callback = None self.interrupt_callback = None -@@ -164,11 +175,11 @@ class _YumCostExclude: +@@ -164,11 +176,11 @@ class _YumCostExclude: return False class YumBase(depsolve.Depsolve): @@ -151432,7 +151525,7 @@ index 99039e0..198dc6d 100644 def __init__(self): depsolve.Depsolve.__init__(self) self._conf = None -@@ -177,6 +188,7 @@ class YumBase(depsolve.Depsolve): +@@ -177,6 +189,7 @@ class YumBase(depsolve.Depsolve): self._up = None self._comps = None self._history = None @@ -151440,7 +151533,7 @@ index 99039e0..198dc6d 100644 self._pkgSack = None self._lockfile = None self._tags = None -@@ -204,6 +216,7 @@ class YumBase(depsolve.Depsolve): +@@ -204,6 +217,7 @@ class YumBase(depsolve.Depsolve): self.run_with_package_names = set() self._cleanup = [] @@ -151448,7 +151541,7 @@ index 99039e0..198dc6d 100644 def __del__(self): self.close() -@@ -213,10 +226,15 @@ class YumBase(depsolve.Depsolve): +@@ -213,10 +227,15 @@ class YumBase(depsolve.Depsolve): for cb in self._cleanup: cb() def close(self): @@ -151464,7 +151557,7 @@ index 99039e0..198dc6d 100644 if self._repos: self._repos.close() -@@ -225,15 +243,33 @@ class YumBase(depsolve.Depsolve): +@@ -225,15 +244,33 @@ class YumBase(depsolve.Depsolve): return transactioninfo.TransactionData() def doGenericSetup(self, cache=0): @@ -151500,7 +151593,7 @@ index 99039e0..198dc6d 100644 warnings.warn(_('doConfigSetup() will go away in a future version of Yum.\n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -297,15 +333,17 @@ class YumBase(depsolve.Depsolve): +@@ -297,15 +334,17 @@ class YumBase(depsolve.Depsolve): # Try the old default fn = '/etc/yum.conf' @@ -151521,7 +151614,7 @@ index 99039e0..198dc6d 100644 if debuglevel != None: startupconf.debuglevel = debuglevel -@@ -336,6 +374,12 @@ class YumBase(depsolve.Depsolve): +@@ -336,6 +375,12 @@ class YumBase(depsolve.Depsolve): self._conf = config.readMainConfig(startupconf) @@ -151534,7 +151627,7 @@ index 99039e0..198dc6d 100644 # We don't want people accessing/altering preconf after it becomes # worthless. So we delete it, and thus. it'll raise AttributeError del self.preconf -@@ -367,22 +411,36 @@ class YumBase(depsolve.Depsolve): +@@ -367,22 +412,36 @@ class YumBase(depsolve.Depsolve): def doLoggingSetup(self, debuglevel, errorlevel, syslog_ident=None, syslog_facility=None, syslog_device='/dev/log'): @@ -151578,7 +151671,7 @@ index 99039e0..198dc6d 100644 if repo_age is None: repo_age = os.stat(repofn)[8] -@@ -391,8 +449,7 @@ class YumBase(depsolve.Depsolve): +@@ -391,8 +450,7 @@ class YumBase(depsolve.Depsolve): try: parser.readfp(confpp_obj) except ParsingError, e: @@ -151588,7 +151681,7 @@ index 99039e0..198dc6d 100644 # Check sections in the .repo file that was just slurped up for section in parser.sections(): -@@ -429,7 +486,15 @@ class YumBase(depsolve.Depsolve): +@@ -429,7 +487,15 @@ class YumBase(depsolve.Depsolve): thisrepo.base_persistdir = self.conf._repos_persistdir @@ -151605,7 +151698,7 @@ index 99039e0..198dc6d 100644 if thisrepo.id in self.repo_setopts: for opt in self.repo_setopts[thisrepo.id].items: if not hasattr(thisrepo, opt): -@@ -440,6 +505,20 @@ class YumBase(depsolve.Depsolve): +@@ -440,6 +506,20 @@ class YumBase(depsolve.Depsolve): if validate and not validate(thisrepo): continue @@ -151626,7 +151719,7 @@ index 99039e0..198dc6d 100644 # Got our list of repo objects, add them to the repos # collection try: -@@ -448,8 +527,11 @@ class YumBase(depsolve.Depsolve): +@@ -448,8 +528,11 @@ class YumBase(depsolve.Depsolve): self.logger.warning(e) def getReposFromConfig(self): @@ -151640,7 +151733,7 @@ index 99039e0..198dc6d 100644 # Read .repo files from directories specified by the reposdir option # (typically /etc/yum/repos.d) repo_config_age = self.conf.config_file_age -@@ -466,18 +548,22 @@ class YumBase(depsolve.Depsolve): +@@ -466,18 +549,22 @@ class YumBase(depsolve.Depsolve): if os.path.isdir(reposdir): for repofn in sorted(glob.glob('%s/*.repo' % reposdir)): @@ -151668,7 +151761,7 @@ index 99039e0..198dc6d 100644 repo = yumRepo.YumRepository(section) try: repo.populate(parser, section, self.conf) -@@ -493,38 +579,40 @@ class YumBase(depsolve.Depsolve): +@@ -493,38 +580,40 @@ class YumBase(depsolve.Depsolve): repo.name = to_unicode(repo.name) # Set attributes not from the config file @@ -151731,7 +151824,7 @@ index 99039e0..198dc6d 100644 if isinstance(self.plugins, plugins.YumPlugins): raise RuntimeError(_("plugins already initialised")) -@@ -533,6 +621,8 @@ class YumBase(depsolve.Depsolve): +@@ -533,6 +622,8 @@ class YumBase(depsolve.Depsolve): def doRpmDBSetup(self): @@ -151740,7 +151833,7 @@ index 99039e0..198dc6d 100644 warnings.warn(_('doRpmDBSetup() will go away in a future version of Yum.\n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -552,7 +642,8 @@ class YumBase(depsolve.Depsolve): +@@ -552,7 +643,8 @@ class YumBase(depsolve.Depsolve): return self._rpmdb def closeRpmDB(self): @@ -151750,7 +151843,7 @@ index 99039e0..198dc6d 100644 if self._rpmdb is not None: self._rpmdb.ts = None self._rpmdb.dropCachedData() -@@ -567,6 +658,12 @@ class YumBase(depsolve.Depsolve): +@@ -567,6 +659,12 @@ class YumBase(depsolve.Depsolve): self._ts = None def doRepoSetup(self, thisrepo=None): @@ -151763,7 +151856,7 @@ index 99039e0..198dc6d 100644 warnings.warn(_('doRepoSetup() will go away in a future version of Yum.\n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -588,7 +685,8 @@ class YumBase(depsolve.Depsolve): +@@ -588,7 +686,8 @@ class YumBase(depsolve.Depsolve): prerepoconf = self.prerepoconf del self.prerepoconf @@ -151773,7 +151866,7 @@ index 99039e0..198dc6d 100644 self.repos.callback = prerepoconf.callback self.repos.setFailureCallback(prerepoconf.failure_callback) self.repos.setInterruptCallback(prerepoconf.interrupt_callback) -@@ -630,6 +728,14 @@ class YumBase(depsolve.Depsolve): +@@ -630,6 +729,14 @@ class YumBase(depsolve.Depsolve): self._repos = RepoStorage(self) def doSackSetup(self, archlist=None, thisrepo=None): @@ -151788,7 +151881,7 @@ index 99039e0..198dc6d 100644 warnings.warn(_('doSackSetup() will go away in a future version of Yum.\n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -711,6 +817,9 @@ class YumBase(depsolve.Depsolve): +@@ -711,6 +818,9 @@ class YumBase(depsolve.Depsolve): def doUpdateSetup(self): @@ -151798,7 +151891,7 @@ index 99039e0..198dc6d 100644 warnings.warn(_('doUpdateSetup() will go away in a future version of Yum.\n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -765,6 +874,8 @@ class YumBase(depsolve.Depsolve): +@@ -765,6 +875,8 @@ class YumBase(depsolve.Depsolve): return self._up def doGroupSetup(self): @@ -151807,7 +151900,20 @@ index 99039e0..198dc6d 100644 warnings.warn(_('doGroupSetup() will go away in a future version of Yum.\n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -829,7 +940,7 @@ class YumBase(depsolve.Depsolve): +@@ -820,16 +932,14 @@ class YumBase(depsolve.Depsolve): + self.verbose_logger.log(logginglevels.DEBUG_4, + _('Adding group file from repository: %s'), repo) + groupfile = repo.getGroups() +- # open it up as a file object so iterparse can cope with our compressed file +- if groupfile: +- groupfile = misc.repo_gen_decompress(groupfile, 'groups.xml', +- cached=repo.cache) +- # Do we want a RepoError here? +- ++ if not groupfile: ++ msg = _('Failed to retrieve group file for repository: %s') % repo ++ self.logger.critical(msg) ++ continue try: self._comps.add(groupfile) except (Errors.GroupsError,Errors.CompsException), e: @@ -151816,7 +151922,7 @@ index 99039e0..198dc6d 100644 self.logger.critical(msg) else: repo.groups_added = True -@@ -837,7 +948,10 @@ class YumBase(depsolve.Depsolve): +@@ -837,7 +947,10 @@ class YumBase(depsolve.Depsolve): if self._comps.compscount == 0: raise Errors.GroupsError, _('No Groups Available in any repository') @@ -151828,7 +151934,7 @@ index 99039e0..198dc6d 100644 self.verbose_logger.debug('group time: %0.3f' % (time.time() - group_st)) return self._comps -@@ -868,7 +982,7 @@ class YumBase(depsolve.Depsolve): +@@ -868,7 +981,7 @@ class YumBase(depsolve.Depsolve): # feed it into _tags.add() self._tags.add(repo.id, tag_sqlite) except (Errors.RepoError, Errors.PkgTagsError), e: @@ -151837,7 +151943,7 @@ index 99039e0..198dc6d 100644 self.logger.critical(msg) -@@ -881,9 +995,18 @@ class YumBase(depsolve.Depsolve): +@@ -881,9 +994,18 @@ class YumBase(depsolve.Depsolve): if self._history is None: pdb_path = self.conf.persistdir + "/history" self._history = yum.history.YumHistory(root=self.conf.installroot, @@ -151857,7 +151963,7 @@ index 99039e0..198dc6d 100644 # properties so they auto-create themselves with defaults repos = property(fget=lambda self: self._getRepos(), fset=lambda self, value: setattr(self, "_repos", value), -@@ -921,6 +1044,11 @@ class YumBase(depsolve.Depsolve): +@@ -921,6 +1043,11 @@ class YumBase(depsolve.Depsolve): fdel=lambda self: setattr(self, "_history", None), doc="Yum History Object") @@ -151869,7 +151975,7 @@ index 99039e0..198dc6d 100644 pkgtags = property(fget=lambda self: self._getTags(), fset=lambda self, value: setattr(self, "_tags",value), fdel=lambda self: setattr(self, "_tags", None), -@@ -928,9 +1056,10 @@ class YumBase(depsolve.Depsolve): +@@ -928,9 +1055,10 @@ class YumBase(depsolve.Depsolve): def doSackFilelistPopulate(self): @@ -151883,7 +151989,7 @@ index 99039e0..198dc6d 100644 necessary = False # I can't think of a nice way of doing this, we have to have the sack here -@@ -951,8 +1080,12 @@ class YumBase(depsolve.Depsolve): +@@ -951,8 +1079,12 @@ class YumBase(depsolve.Depsolve): self.repos.populateSack(mdtype='filelists') def yumUtilsMsg(self, func, prog): @@ -151898,7 +152004,7 @@ index 99039e0..198dc6d 100644 if self.rpmdb.contains(name="yum-utils"): return -@@ -964,8 +1097,17 @@ class YumBase(depsolve.Depsolve): +@@ -964,8 +1096,17 @@ class YumBase(depsolve.Depsolve): (hibeg, prog, hiend)) def buildTransaction(self, unfinished_transactions_check=True): @@ -151918,7 +152024,7 @@ index 99039e0..198dc6d 100644 if (unfinished_transactions_check and misc.find_unfinished_transactions(yumlibpath=self.conf.persistdir)): msg = _('There are unfinished transactions remaining. You might ' \ -@@ -1004,7 +1146,7 @@ class YumBase(depsolve.Depsolve): +@@ -1004,7 +1145,7 @@ class YumBase(depsolve.Depsolve): # If transaction was changed by postresolve plugins then we should run skipbroken again (rescode, restring) = self._doSkipBroken(rescode, restring, clear_skipped=False ) @@ -151927,7 +152033,7 @@ index 99039e0..198dc6d 100644 self.tsInfo.pkgSack.dropCachedData() # FIXME: This is horrible, see below and yummain. Maybe create a real -@@ -1044,6 +1186,37 @@ class YumBase(depsolve.Depsolve): +@@ -1044,6 +1185,39 @@ class YumBase(depsolve.Depsolve): if first.verEQ(other): continue msg = _('Protected multilib versions: %s != %s') @@ -151937,14 +152043,16 @@ index 99039e0..198dc6d 100644 + bigmsg = _("""\ + Multilib version problems found. This often means that the root +cause is something else and multilib version checking is just -+pointing it that there is a problem. Eg.: ++pointing out that there is a problem. Eg.: + + 1. You have an upgrade for %(name)s which is missing some + dependency that another package requires. Yum is trying to + solve this by installing an older version of %(name)s of the + different architecture. If you exclude the bad architecture + yum will tell you what the root cause is (which package -+ requires what). ++ requires what). You can try redoing the upgrade with ++ --exclude %(name)s.otherarch ... this should give you an error ++ message showing the root cause of the problem. + + 2. You have multiple architectures of %(name)s installed, but + yum can only see an upgrade for one of those arcitectures. @@ -151965,7 +152073,7 @@ index 99039e0..198dc6d 100644 xrestring.append(msg % (first, other)) if xrestring: rescode = 1 -@@ -1242,13 +1415,15 @@ class YumBase(depsolve.Depsolve): +@@ -1242,13 +1416,15 @@ class YumBase(depsolve.Depsolve): if None in pkgtup: return None return pkgtup @@ -151985,7 +152093,7 @@ index 99039e0..198dc6d 100644 if pkgtup is None: return self._not_found_i[pkgtup] = YumNotFoundPackage(pkgtup) -@@ -1454,8 +1629,14 @@ class YumBase(depsolve.Depsolve): +@@ -1454,8 +1630,14 @@ class YumBase(depsolve.Depsolve): return probs def runTransaction(self, cb): @@ -152001,7 +152109,7 @@ index 99039e0..198dc6d 100644 self.plugins.run('pretrans') # We may want to put this other places, eventually, but for now it's -@@ -1516,10 +1697,23 @@ class YumBase(depsolve.Depsolve): +@@ -1516,10 +1698,23 @@ class YumBase(depsolve.Depsolve): pass self._ts_save_file = None @@ -152025,7 +152133,7 @@ index 99039e0..198dc6d 100644 # make resultobject - just a plain yumgenericholder object resultobject = misc.GenericHolder() -@@ -1567,13 +1761,24 @@ class YumBase(depsolve.Depsolve): +@@ -1567,13 +1762,24 @@ class YumBase(depsolve.Depsolve): self.plugins.run('posttrans') # sync up what just happened versus what is in the rpmdb if not self.ts.isTsFlagSet(rpm.RPMTRANS_FLAG_TEST): @@ -152055,7 +152163,7 @@ index 99039e0..198dc6d 100644 # check to see that the rpmdb and the tsInfo roughly matches # push package object metadata outside of rpmdb into yumdb # delete old yumdb metadata entries -@@ -1584,9 +1789,16 @@ class YumBase(depsolve.Depsolve): +@@ -1584,9 +1790,16 @@ class YumBase(depsolve.Depsolve): # that there is not also an install of this pkg in the tsInfo (reinstall) # for any kind of install add from_repo to the yumdb, and the cmdline # and the install reason @@ -152072,7 +152180,7 @@ index 99039e0..198dc6d 100644 for txmbr in self.tsInfo: if txmbr.output_state in TS_INSTALL_STATES: if not self.rpmdb.contains(po=txmbr.po): -@@ -1596,7 +1808,9 @@ class YumBase(depsolve.Depsolve): +@@ -1596,7 +1809,9 @@ class YumBase(depsolve.Depsolve): ' but is not!' % txmbr.po)) # Note: Get Panu to do te.Failed() so we don't have to txmbr.output_state = TS_FAILED @@ -152082,7 +152190,7 @@ index 99039e0..198dc6d 100644 po = self.getInstalledPackageObject(txmbr.pkgtup) rpo = txmbr.po po.yumdb_info.from_repo = rpo.repoid -@@ -1630,6 +1844,10 @@ class YumBase(depsolve.Depsolve): +@@ -1630,6 +1845,10 @@ class YumBase(depsolve.Depsolve): if md: po.yumdb_info.from_repo_timestamp = str(md.timestamp) @@ -152093,7 +152201,7 @@ index 99039e0..198dc6d 100644 loginuid = misc.getloginuid() if txmbr.updates or txmbr.downgrades or txmbr.reinstall: if txmbr.updates: -@@ -1640,11 +1858,16 @@ class YumBase(depsolve.Depsolve): +@@ -1640,11 +1859,16 @@ class YumBase(depsolve.Depsolve): opo = po if 'installed_by' in opo.yumdb_info: po.yumdb_info.installed_by = opo.yumdb_info.installed_by @@ -152110,7 +152218,7 @@ index 99039e0..198dc6d 100644 # Remove old ones after installing new ones, so we can copy values. for txmbr in self.tsInfo: if txmbr.output_state in TS_INSTALL_STATES: -@@ -1662,10 +1885,13 @@ class YumBase(depsolve.Depsolve): +@@ -1662,10 +1886,13 @@ class YumBase(depsolve.Depsolve): ' but is not!' % txmbr.po)) # Note: Get Panu to do te.Failed() so we don't have to txmbr.output_state = TS_FAILED @@ -152124,7 +152232,7 @@ index 99039e0..198dc6d 100644 self.verbose_logger.log(logginglevels.DEBUG_2, 'What is this? %s' % txmbr.po) self.plugins.run('postverifytrans') -@@ -1680,10 +1906,11 @@ class YumBase(depsolve.Depsolve): +@@ -1680,10 +1907,11 @@ class YumBase(depsolve.Depsolve): self.verbose_logger.debug('VerifyTransaction time: %0.3f' % (time.time() - vt_st)) def costExcludePackages(self): @@ -152140,7 +152248,7 @@ index 99039e0..198dc6d 100644 # if all the repo.costs are equal then don't bother running things costs = {} for r in self.repos.listEnabled(): -@@ -1705,10 +1932,12 @@ class YumBase(depsolve.Depsolve): +@@ -1705,10 +1933,12 @@ class YumBase(depsolve.Depsolve): done = True def excludePackages(self, repo=None): @@ -152156,7 +152264,7 @@ index 99039e0..198dc6d 100644 if "all" in self.conf.disable_excludes: return -@@ -1735,9 +1964,11 @@ class YumBase(depsolve.Depsolve): +@@ -1735,9 +1965,11 @@ class YumBase(depsolve.Depsolve): self.pkgSack.addPackageExcluder(repoid, exid,'exclude.match', match) def includePackages(self, repo): @@ -152171,7 +152279,7 @@ index 99039e0..198dc6d 100644 includelist = repo.getIncludePkgList() if len(includelist) == 0: -@@ -1757,8 +1988,11 @@ class YumBase(depsolve.Depsolve): +@@ -1757,8 +1989,11 @@ class YumBase(depsolve.Depsolve): self.pkgSack.addPackageExcluder(repo.id, exid, 'exclude.marked') def doLock(self, lockfile = YUM_PID_FILE): @@ -152185,7 +152293,7 @@ index 99039e0..198dc6d 100644 if self.conf.uid != 0: # If we are a user, assume we are using the root cache ... so don't # bother locking. -@@ -1774,38 +2008,26 @@ class YumBase(depsolve.Depsolve): +@@ -1774,38 +2009,26 @@ class YumBase(depsolve.Depsolve): mypid=str(os.getpid()) while not self._lock(lockfile, mypid, 0644): @@ -152239,7 +152347,7 @@ index 99039e0..198dc6d 100644 # if we're not root then we don't lock - just return nicely # Note that we can get here from __del__, so if we haven't created # YumBase.conf we don't want to do so here as creating stuff inside -@@ -1830,31 +2052,69 @@ class YumBase(depsolve.Depsolve): +@@ -1830,31 +2053,69 @@ class YumBase(depsolve.Depsolve): self._unlock(lockfile) self._lockfile = None @@ -152319,7 +152427,7 @@ index 99039e0..198dc6d 100644 failed = False if type(fo) is types.InstanceType: -@@ -1894,9 +2154,16 @@ class YumBase(depsolve.Depsolve): +@@ -1894,9 +2155,16 @@ class YumBase(depsolve.Depsolve): def verifyChecksum(self, fo, checksumType, csum): @@ -152339,7 +152447,7 @@ index 99039e0..198dc6d 100644 try: filesum = misc.checksum(checksumType, fo) except Errors.MiscError, e: -@@ -1908,6 +2175,17 @@ class YumBase(depsolve.Depsolve): +@@ -1908,6 +2176,17 @@ class YumBase(depsolve.Depsolve): return 0 def downloadPkgs(self, pkglist, callback=None, callback_total=None): @@ -152357,7 +152465,43 @@ index 99039e0..198dc6d 100644 def mediasort(apo, bpo): # FIXME: we should probably also use the mediaid; else we # could conceivably ping-pong between different disc1's -@@ -1979,8 +2257,9 @@ class YumBase(depsolve.Depsolve): +@@ -1943,6 +2222,7 @@ class YumBase(depsolve.Depsolve): + self.history.close() + + self.plugins.run('predownload', pkglist=pkglist) ++ downloadonly = getattr(self.conf, 'downloadonly', False) + repo_cached = False + remote_pkgs = [] + remote_size = 0 +@@ -1961,6 +2241,14 @@ class YumBase(depsolve.Depsolve): + self.verbose_logger.debug(_("using local copy of %s") %(po,)) + continue + ++ if downloadonly: ++ # download to temp file ++ rpmfile = po.localpath ++ po.localpath += '.%d.tmp' % os.getpid() ++ try: os.rename(rpmfile, po.localpath) ++ except OSError: pass ++ po.basepath # prefetch now; fails when repos are closed ++ + remote_pkgs.append(po) + remote_size += po.size + +@@ -1969,7 +2257,11 @@ class YumBase(depsolve.Depsolve): + # way to save this, report the error and return + if (self.conf.cache or repo_cached) and errors: + return errors +- ++ if downloadonly: ++ # close DBs, unlock ++ self.repos.close() ++ self.closeRpmDB() ++ self.doUnlock() + + remote_pkgs.sort(mediasort) + # This is kind of a hack and does nothing in non-Fedora versions, +@@ -1979,8 +2271,9 @@ class YumBase(depsolve.Depsolve): urlgrabber.progress.text_meter_total_size(remote_size) beg_download = time.time() i = 0 @@ -152368,7 +152512,7 @@ index 99039e0..198dc6d 100644 for po in remote_pkgs: # Recheck if the file is there, works around a couple of weird # edge cases. -@@ -1992,52 +2271,47 @@ class YumBase(depsolve.Depsolve): +@@ -1992,67 +2285,94 @@ class YumBase(depsolve.Depsolve): remote_size -= po.size if hasattr(urlgrabber.progress, 'text_meter_total_size'): urlgrabber.progress.text_meter_total_size(remote_size, @@ -152447,7 +152591,32 @@ index 99039e0..198dc6d 100644 if hasattr(urlgrabber.progress, 'text_meter_total_size'): urlgrabber.progress.text_meter_total_size(0) if callback_total is not None and not errors: -@@ -2052,7 +2326,22 @@ class YumBase(depsolve.Depsolve): + callback_total(remote_pkgs, remote_size, beg_download) + +- self.plugins.run('postdownload', pkglist=pkglist, errors=errors) ++ if downloadonly: ++ for po in remote_pkgs: ++ rpmfile = po.localpath.rsplit('.', 2)[0] ++ if po in errors: ++ # we may throw away partial file here- but we don't lock, ++ # so can't rename tempfile to rpmfile safely ++ misc.unlink_f(po.localpath) ++ if po not in errors: ++ # verifyPkg() didn't complain, so (potentially) ++ # overwriting another copy should not be a problem ++ os.rename(po.localpath, rpmfile) ++ po.localpath = rpmfile ++ else: ++ # XXX: Run unlocked? Skip this for now.. ++ self.plugins.run('postdownload', pkglist=pkglist, errors=errors) + + # Close curl object after we've downloaded everything. + if hasattr(urlgrabber.grabber, 'reset_curl_obj'): + urlgrabber.grabber.reset_curl_obj() + ++ if downloadonly and not errors: # caller handles errors ++ self.verbose_logger.info(_('exiting because --downloadonly specified')) ++ sys.exit(self.exit_code) return errors def verifyHeader(self, fo, po, raiseError): @@ -152471,7 +152640,7 @@ index 99039e0..198dc6d 100644 if type(fo) is types.InstanceType: fo = fo.filename -@@ -2076,9 +2365,12 @@ class YumBase(depsolve.Depsolve): +@@ -2076,9 +2396,12 @@ class YumBase(depsolve.Depsolve): return 1 def downloadHeader(self, po): @@ -152486,7 +152655,7 @@ index 99039e0..198dc6d 100644 if hasattr(po, 'pkgtype') and po.pkgtype == 'local': return -@@ -2122,15 +2414,17 @@ class YumBase(depsolve.Depsolve): +@@ -2122,15 +2445,17 @@ class YumBase(depsolve.Depsolve): return def sigCheckPkg(self, po): @@ -152512,7 +152681,7 @@ index 99039e0..198dc6d 100644 if self._override_sigchecks: check = False hasgpgkey = 0 -@@ -2181,6 +2475,9 @@ class YumBase(depsolve.Depsolve): +@@ -2181,6 +2506,9 @@ class YumBase(depsolve.Depsolve): return result, msg def cleanUsedHeadersPackages(self): @@ -152522,7 +152691,7 @@ index 99039e0..198dc6d 100644 filelist = [] for txmbr in self.tsInfo: if txmbr.po.state not in TS_INSTALL_STATES: -@@ -2218,27 +2515,42 @@ class YumBase(depsolve.Depsolve): +@@ -2218,27 +2546,42 @@ class YumBase(depsolve.Depsolve): _('%s removed'), fn) def cleanHeaders(self): @@ -152567,7 +152736,7 @@ index 99039e0..198dc6d 100644 cachedir = self.conf.persistdir + "/rpmdb-indexes/" if not os.path.exists(cachedir): filelist = [] -@@ -2272,8 +2584,29 @@ class YumBase(depsolve.Depsolve): +@@ -2272,8 +2615,29 @@ class YumBase(depsolve.Depsolve): def doPackageLists(self, pkgnarrow='all', patterns=None, showdups=None, ignore_case=False): @@ -152599,7 +152768,7 @@ index 99039e0..198dc6d 100644 if showdups is None: showdups = self.conf.showdupesfromrepos ygh = misc.GenericHolder(iter=pkgnarrow) -@@ -2323,10 +2656,22 @@ class YumBase(depsolve.Depsolve): +@@ -2323,10 +2687,22 @@ class YumBase(depsolve.Depsolve): key = (pkg.name, pkg.arch) if pkg.pkgtup in dinst: reinstall_available.append(pkg) @@ -152625,7 +152794,7 @@ index 99039e0..198dc6d 100644 # produce the updates list of tuples elif pkgnarrow == 'updates': -@@ -2461,14 +2806,13 @@ class YumBase(depsolve.Depsolve): +@@ -2461,14 +2837,13 @@ class YumBase(depsolve.Depsolve): def findDeps(self, pkgs): @@ -152645,7 +152814,7 @@ index 99039e0..198dc6d 100644 results = {} for pkg in pkgs: -@@ -2495,10 +2839,22 @@ class YumBase(depsolve.Depsolve): +@@ -2495,10 +2870,22 @@ class YumBase(depsolve.Depsolve): # pre 3.2.10 API used to always showdups, so that's the default atm. def searchGenerator(self, fields, criteria, showdups=True, keys=False, searchtags=True, searchrpmdb=True): @@ -152672,7 +152841,7 @@ index 99039e0..198dc6d 100644 sql_fields = [] for f in fields: sql_fields.append(RPM_TO_SQLITE.get(f, f)) -@@ -2661,6 +3017,14 @@ class YumBase(depsolve.Depsolve): +@@ -2661,6 +3048,14 @@ class YumBase(depsolve.Depsolve): yield (po, vs) def searchPackageTags(self, criteria): @@ -152687,7 +152856,7 @@ index 99039e0..198dc6d 100644 results = {} # name = [(criteria, taglist)] for c in criteria: c = c.lower() -@@ -2677,11 +3041,16 @@ class YumBase(depsolve.Depsolve): +@@ -2677,11 +3072,16 @@ class YumBase(depsolve.Depsolve): return results def searchPackages(self, fields, criteria, callback=None): @@ -152709,7 +152878,7 @@ index 99039e0..198dc6d 100644 warnings.warn(_('searchPackages() will go away in a future version of Yum.\ Use searchGenerator() instead. \n'), Errors.YumFutureDeprecationWarning, stacklevel=2) -@@ -2700,13 +3069,23 @@ class YumBase(depsolve.Depsolve): +@@ -2700,13 +3100,23 @@ class YumBase(depsolve.Depsolve): def searchPackageProvides(self, args, callback=None, callback_has_matchfor=False): @@ -152737,7 +152906,7 @@ index 99039e0..198dc6d 100644 else: isglob = True canBeFile = misc.re_filename(arg) -@@ -2723,7 +3102,7 @@ class YumBase(depsolve.Depsolve): +@@ -2723,7 +3133,7 @@ class YumBase(depsolve.Depsolve): where = self.returnPackagesByDep(arg) else: usedDepString = False @@ -152746,7 +152915,7 @@ index 99039e0..198dc6d 100644 self.verbose_logger.log(logginglevels.DEBUG_1, P_('Searching %d package', 'Searching %d packages', len(where)), len(where)) -@@ -2817,25 +3196,160 @@ class YumBase(depsolve.Depsolve): +@@ -2817,25 +3227,160 @@ class YumBase(depsolve.Depsolve): return matches @@ -152919,7 +153088,7 @@ index 99039e0..198dc6d 100644 if uservisible: if grp.user_visible: installed.append(grp) -@@ -2847,34 +3361,98 @@ class YumBase(depsolve.Depsolve): +@@ -2847,34 +3392,98 @@ class YumBase(depsolve.Depsolve): available.append(grp) else: available.append(grp) @@ -153028,7 +153197,7 @@ index 99039e0..198dc6d 100644 thesegroups = self.comps.return_groups(grpid) if not thesegroups: raise Errors.GroupsError, _("No Group named %s exists") % to_unicode(grpid) -@@ -2898,13 +3476,58 @@ class YumBase(depsolve.Depsolve): +@@ -2898,13 +3507,58 @@ class YumBase(depsolve.Depsolve): self.tsInfo.remove(txmbr.po.pkgtup) @@ -153094,7 +153263,7 @@ index 99039e0..198dc6d 100644 """ if not self.comps.has_group(grpid): -@@ -2920,6 +3543,9 @@ class YumBase(depsolve.Depsolve): +@@ -2920,6 +3574,9 @@ class YumBase(depsolve.Depsolve): if group_package_types: package_types = group_package_types @@ -153104,7 +153273,7 @@ index 99039e0..198dc6d 100644 for thisgroup in thesegroups: if thisgroup.selected: continue -@@ -2934,12 +3560,49 @@ class YumBase(depsolve.Depsolve): +@@ -2934,12 +3591,49 @@ class YumBase(depsolve.Depsolve): if 'optional' in package_types: pkgs.extend(thisgroup.optional_packages) @@ -153155,7 +153324,7 @@ index 99039e0..198dc6d 100644 except Errors.InstallError, e: self.verbose_logger.debug(_('No package named %s available to be installed'), pkg) -@@ -2953,7 +3616,9 @@ class YumBase(depsolve.Depsolve): +@@ -2953,7 +3647,9 @@ class YumBase(depsolve.Depsolve): group_conditionals = enable_group_conditionals count_cond_test = 0 @@ -153166,7 +153335,7 @@ index 99039e0..198dc6d 100644 for condreq, cond in thisgroup.conditional_packages.iteritems(): if self.isPackageInstalled(cond): try: -@@ -2990,17 +3655,22 @@ class YumBase(depsolve.Depsolve): +@@ -2990,17 +3686,22 @@ class YumBase(depsolve.Depsolve): if cond not in self.tsInfo.conditionals: self.tsInfo.conditionals[cond] = [] self.tsInfo.conditionals[cond].extend(pkgs) @@ -153195,7 +153364,7 @@ index 99039e0..198dc6d 100644 if not self.comps.has_group(grpid): raise Errors.GroupsError, _("No Group named %s exists") % to_unicode(grpid) -@@ -3008,7 +3678,8 @@ class YumBase(depsolve.Depsolve): +@@ -3008,7 +3709,8 @@ class YumBase(depsolve.Depsolve): thesegroups = self.comps.return_groups(grpid) if not thesegroups: raise Errors.GroupsError, _("No Group named %s exists") % to_unicode(grpid) @@ -153205,7 +153374,7 @@ index 99039e0..198dc6d 100644 for thisgroup in thesegroups: thisgroup.selected = False -@@ -3034,13 +3705,102 @@ class YumBase(depsolve.Depsolve): +@@ -3034,13 +3736,102 @@ class YumBase(depsolve.Depsolve): for pkg in self.tsInfo.conditionals.get(txmbr.name, []): self.tsInfo.remove(pkg.pkgtup) @@ -153314,7 +153483,7 @@ index 99039e0..198dc6d 100644 # look it up in the self.localPackages first: for po in self.localPackages: if po.pkgtup == pkgtup: -@@ -3049,7 +3809,7 @@ class YumBase(depsolve.Depsolve): +@@ -3049,7 +3840,7 @@ class YumBase(depsolve.Depsolve): pkgs = self.pkgSack.searchPkgTuple(pkgtup) if len(pkgs) == 0: @@ -153323,7 +153492,7 @@ index 99039e0..198dc6d 100644 if allow_missing: # This can happen due to excludes after .up has return None # happened. raise Errors.DepError, _('Package tuple %s could not be found in packagesack') % str(pkgtup) -@@ -3065,13 +3825,21 @@ class YumBase(depsolve.Depsolve): +@@ -3065,13 +3856,21 @@ class YumBase(depsolve.Depsolve): return result def getInstalledPackageObject(self, pkgtup): @@ -153350,7 +153519,7 @@ index 99039e0..198dc6d 100644 raise Errors.RpmDBError, _('Package tuple %s could not be found in rpmdb') % str(pkgtup) # Dito. FIXME from getPackageObject() for len() > 1 ... :) -@@ -3079,9 +3847,11 @@ class YumBase(depsolve.Depsolve): +@@ -3079,9 +3878,11 @@ class YumBase(depsolve.Depsolve): return po def gpgKeyCheck(self): @@ -153364,7 +153533,7 @@ index 99039e0..198dc6d 100644 gpgkeyschecked = self.conf.cachedir + '/.gpgkeyschecked.yum' if os.path.exists(gpgkeyschecked): return 1 -@@ -3106,9 +3876,13 @@ class YumBase(depsolve.Depsolve): +@@ -3106,9 +3907,13 @@ class YumBase(depsolve.Depsolve): return 1 def returnPackagesByDep(self, depstring): @@ -153380,7 +153549,7 @@ index 99039e0..198dc6d 100644 if not depstring: return [] -@@ -3135,9 +3909,16 @@ class YumBase(depsolve.Depsolve): +@@ -3135,9 +3940,16 @@ class YumBase(depsolve.Depsolve): return self.pkgSack.getProvides(depname, depflags, depver).keys() def returnPackageByDep(self, depstring): @@ -153400,7 +153569,7 @@ index 99039e0..198dc6d 100644 # we get all sorts of randomness here errstring = depstring if type(depstring) not in types.StringTypes: -@@ -3149,16 +3930,22 @@ class YumBase(depsolve.Depsolve): +@@ -3149,16 +3961,22 @@ class YumBase(depsolve.Depsolve): raise Errors.YumBaseError, _('No Package found for %s') % errstring ps = ListPackageSack(pkglist) @@ -153427,7 +153596,7 @@ index 99039e0..198dc6d 100644 if not depstring: return [] -@@ -3184,12 +3971,47 @@ class YumBase(depsolve.Depsolve): +@@ -3184,12 +4002,47 @@ class YumBase(depsolve.Depsolve): return self.rpmdb.getProvides(depname, depflags, depver).keys() @@ -153477,7 +153646,7 @@ index 99039e0..198dc6d 100644 if len(pkglist) == 0: -@@ -3198,14 +4020,23 @@ class YumBase(depsolve.Depsolve): +@@ -3198,14 +4051,23 @@ class YumBase(depsolve.Depsolve): if len(pkglist) == 1: return pkglist[0] @@ -153507,7 +153676,7 @@ index 99039e0..198dc6d 100644 returnlist = [] compatArchList = self.arch.get_arch_list(arch) multiLib = [] -@@ -3222,9 +4053,9 @@ class YumBase(depsolve.Depsolve): +@@ -3222,9 +4084,9 @@ class YumBase(depsolve.Depsolve): singleLib.append(po) # we now have three lists. find the best package(s) of each @@ -153520,7 +153689,7 @@ index 99039e0..198dc6d 100644 if single_name and multi and single and multi.name != single.name: # Sinlge _must_ match multi, if we want a single package name -@@ -3238,7 +4069,7 @@ class YumBase(depsolve.Depsolve): +@@ -3238,7 +4100,7 @@ class YumBase(depsolve.Depsolve): # if there's a noarch and it's newer than the multilib, we want # just the noarch. otherwise, we want multi + single elif multi: @@ -153529,7 +153698,7 @@ index 99039e0..198dc6d 100644 if best.arch == "noarch": returnlist.append(no) else: -@@ -3246,7 +4077,7 @@ class YumBase(depsolve.Depsolve): +@@ -3246,7 +4108,7 @@ class YumBase(depsolve.Depsolve): if single: returnlist.append(single) # similar for the non-multilib case elif single: @@ -153538,7 +153707,7 @@ index 99039e0..198dc6d 100644 if best.arch == "noarch": returnlist.append(no) else: -@@ -3350,28 +4181,58 @@ class YumBase(depsolve.Depsolve): +@@ -3350,28 +4212,58 @@ class YumBase(depsolve.Depsolve): done = True slow = next_func(slow) @@ -153602,7 +153771,7 @@ index 99039e0..198dc6d 100644 try: txmbrs = self.groupRemove(group_string) except yum.Errors.GroupsError: -@@ -3387,6 +4248,8 @@ class YumBase(depsolve.Depsolve): +@@ -3387,6 +4279,8 @@ class YumBase(depsolve.Depsolve): assert pattern[0] == '@' grpid = pattern[1:] @@ -153611,7 +153780,7 @@ index 99039e0..198dc6d 100644 thesegroups = self.comps.return_groups(grpid) if not thesegroups: raise Errors.GroupsError, _("No Group named %s exists") % to_unicode(grpid) -@@ -3398,7 +4261,11 @@ class YumBase(depsolve.Depsolve): +@@ -3398,7 +4292,11 @@ class YumBase(depsolve.Depsolve): def _minus_deselect(self, pattern): """ Remove things from the transaction, like kickstart. """ assert pattern[0] == '-' @@ -153624,7 +153793,7 @@ index 99039e0..198dc6d 100644 if pat and pat[0] == '@': pat = pat[1:] -@@ -3437,14 +4304,61 @@ class YumBase(depsolve.Depsolve): +@@ -3437,14 +4335,87 @@ class YumBase(depsolve.Depsolve): if flag not in self.tsInfo.probFilterFlags: self.tsInfo.probFilterFlags.append(flag) @@ -153652,6 +153821,32 @@ index 99039e0..198dc6d 100644 + return True + + return False ++ ++ def _valid_install_arch(self, po, ipkgs=None): ++ ''' See if we can install this arch of package, mainly for ++ i386 vs. i586 or ppc64 vs. ppc64 etc. ''' ++ if not ipkgs: ++ ipkgs = self.rpmdb.searchNames([po.name]) ++ else: ++ ipkgs = ipkgs[:] ++ ++ # Add these anyway, just to be sure. ++ for txmbr in self.tsInfo.matchNaevr(po.name): ++ if txmbr.output_state not in TS_INSTALL_STATES: ++ continue ++ ipkgs.append(txmbr.po) ++ ++ for ipkg in ipkgs: ++ if po.arch == ipkg.arch: ++ continue ++ if not po.verEQ(ipkg): ++ continue ++ if canCoinstall(po.arch, ipkg.arch): ++ continue ++ self.verbose_logger.log(logginglevels.INFO_2, ++ _("Package: %s - can't co-install with %s"), po, ipkg) ++ return False ++ return True + def install(self, po=None, **kwargs): - """try to mark for install the item specified. Uses provided package @@ -153692,7 +153887,7 @@ index 99039e0..198dc6d 100644 pkgs = [] was_pattern = False if po: -@@ -3477,20 +4391,12 @@ class YumBase(depsolve.Depsolve): +@@ -3477,20 +4448,12 @@ class YumBase(depsolve.Depsolve): self.verbose_logger.debug(_('Checking for virtual provide or file-provide for %s'), arg) @@ -153719,7 +153914,7 @@ index 99039e0..198dc6d 100644 else: nevra_dict = self._nevra_kwarg_parse(kwargs) -@@ -3577,8 +4483,8 @@ class YumBase(depsolve.Depsolve): +@@ -3577,17 +4540,20 @@ class YumBase(depsolve.Depsolve): continue # make sure this shouldn't be passed to update: @@ -153730,7 +153925,11 @@ index 99039e0..198dc6d 100644 txmbrs = self.update(po=po) tx_return.extend(txmbrs) continue -@@ -3587,7 +4493,7 @@ class YumBase(depsolve.Depsolve): ++ ++ if not self._valid_install_arch(po, ipkgs): ++ continue + + # Make sure we're not installing a package which is obsoleted by # something else in the repo. Unless there is a obsoletion loop, # at which point ignore everything. obsoleting_pkg = None @@ -153739,7 +153938,7 @@ index 99039e0..198dc6d 100644 obsoleting_pkg = self._test_loop(po, self._pkg2obspkg) if obsoleting_pkg is not None: # this is not a definitive check but it'll make sure we don't -@@ -3600,23 +4506,23 @@ class YumBase(depsolve.Depsolve): +@@ -3600,23 +4566,23 @@ class YumBase(depsolve.Depsolve): already_obs = pkgs[0] if already_obs: @@ -153770,7 +153969,7 @@ index 99039e0..198dc6d 100644 continue # make sure we don't have a name.arch of this already installed -@@ -3630,7 +4536,7 @@ class YumBase(depsolve.Depsolve): +@@ -3630,7 +4596,7 @@ class YumBase(depsolve.Depsolve): found = True break if not found: @@ -153779,7 +153978,7 @@ index 99039e0..198dc6d 100644 txmbrs = self.update(po=po) tx_return.extend(txmbrs) continue -@@ -3719,19 +4625,47 @@ class YumBase(depsolve.Depsolve): +@@ -3719,19 +4685,47 @@ class YumBase(depsolve.Depsolve): return txmbr def update(self, po=None, requiringPo=None, update_to=False, **kwargs): @@ -153834,7 +154033,7 @@ index 99039e0..198dc6d 100644 tx_return = [] if not po and not kwargs: # update everything (the easy case) self.verbose_logger.log(logginglevels.DEBUG_2, _('Updating Everything')) -@@ -3765,7 +4699,14 @@ class YumBase(depsolve.Depsolve): +@@ -3765,7 +4759,14 @@ class YumBase(depsolve.Depsolve): if new is None: continue tx_return.extend(self.update(po=new)) @@ -153850,7 +154049,7 @@ index 99039e0..198dc6d 100644 return tx_return # complications -@@ -3787,7 +4728,7 @@ class YumBase(depsolve.Depsolve): +@@ -3787,7 +4788,7 @@ class YumBase(depsolve.Depsolve): return self._minus_deselect(kwargs['pattern']) if kwargs['pattern'] and kwargs['pattern'][0] == '@': @@ -153859,7 +154058,7 @@ index 99039e0..198dc6d 100644 arg = kwargs['pattern'] if not update_to: -@@ -3843,7 +4784,7 @@ class YumBase(depsolve.Depsolve): +@@ -3843,7 +4844,7 @@ class YumBase(depsolve.Depsolve): availpkgs = self._compare_providers(availpkgs, requiringPo) availpkgs = map(lambda x: x[0], availpkgs) elif not availpkgs: @@ -153868,10 +154067,13 @@ index 99039e0..198dc6d 100644 # for any thing specified # get the list of available pkgs matching it (or take the po) -@@ -3920,6 +4861,18 @@ class YumBase(depsolve.Depsolve): +@@ -3920,6 +4921,21 @@ class YumBase(depsolve.Depsolve): tx_return.append(txmbr) for available_pkg in availpkgs: ++ if not self._valid_install_arch(available_pkg): ++ continue ++ + # "Just do it" if it's a local pkg. + if isinstance(available_pkg, YumLocalPackage): + n = available_pkg.name @@ -153887,7 +154089,7 @@ index 99039e0..198dc6d 100644 # Make sure we're not installing a package which is obsoleted by # something else in the repo. Unless there is a obsoletion loop, # at which point ignore everything. -@@ -3985,11 +4938,18 @@ class YumBase(depsolve.Depsolve): +@@ -3985,11 +5001,18 @@ class YumBase(depsolve.Depsolve): return tx_return def remove(self, po=None, **kwargs): @@ -153911,7 +154113,7 @@ index 99039e0..198dc6d 100644 if not po and not kwargs: raise Errors.RemoveError, 'Nothing specified to remove' -@@ -4055,17 +5015,19 @@ class YumBase(depsolve.Depsolve): +@@ -4055,17 +5078,19 @@ class YumBase(depsolve.Depsolve): return tx_return def installLocal(self, pkg, po=None, updateonly=False): @@ -153941,7 +154143,7 @@ index 99039e0..198dc6d 100644 # read in the package into a YumLocalPackage Object # append it to self.localPackages # check if it can be installed or updated based on nevra versus rpmdb -@@ -4183,16 +5145,15 @@ class YumBase(depsolve.Depsolve): +@@ -4183,16 +5208,15 @@ class YumBase(depsolve.Depsolve): return tx_return def reinstallLocal(self, pkg, po=None): @@ -153966,7 +154168,7 @@ index 99039e0..198dc6d 100644 if not po: try: po = YumUrlPackage(self, ts=self.rpmdb.readOnlyTS(), url=pkg, -@@ -4215,9 +5176,19 @@ class YumBase(depsolve.Depsolve): +@@ -4215,9 +5239,19 @@ class YumBase(depsolve.Depsolve): return self.reinstall(po=po) def reinstall(self, po=None, **kwargs): @@ -153989,7 +154191,7 @@ index 99039e0..198dc6d 100644 self._add_prob_flags(rpm.RPMPROB_FILTER_REPLACEPKG, rpm.RPMPROB_FILTER_REPLACENEWFILES, rpm.RPMPROB_FILTER_REPLACEOLDFILES) -@@ -4259,16 +5230,15 @@ class YumBase(depsolve.Depsolve): +@@ -4259,16 +5293,15 @@ class YumBase(depsolve.Depsolve): return tx_mbrs def downgradeLocal(self, pkg, po=None): @@ -154014,7 +154216,7 @@ index 99039e0..198dc6d 100644 if not po: try: po = YumUrlPackage(self, ts=self.rpmdb.readOnlyTS(), url=pkg, -@@ -4309,13 +5279,19 @@ class YumBase(depsolve.Depsolve): +@@ -4309,13 +5342,19 @@ class YumBase(depsolve.Depsolve): return False def downgrade(self, po=None, **kwargs): @@ -154041,7 +154243,18 @@ index 99039e0..198dc6d 100644 if not po and not kwargs: raise Errors.DowngradeError, 'Nothing specified to downgrade' -@@ -4421,6 +5397,9 @@ class YumBase(depsolve.Depsolve): +@@ -4397,6 +5436,10 @@ class YumBase(depsolve.Depsolve): + # installed version. Indexed fromn the latest installed pkgtup. + downgrade_apkgs = {} + for pkg in sorted(apkgs): ++ # We are cleverer here, I think... ++ # if not self._valid_install_arch(pkg, ipkgs): ++ # continue ++ + na = (pkg.name, pkg.arch) + + # Here we allow downgrades from .i386 => .noarch, or .i586 => .i386 +@@ -4421,6 +5464,9 @@ class YumBase(depsolve.Depsolve): warned_nas.add(na) continue @@ -154051,7 +154264,7 @@ index 99039e0..198dc6d 100644 if pkg.verGE(lipkg): if na not in warned_nas: msg = _('Only Upgrade available on package: %s') % pkg -@@ -4457,7 +5436,7 @@ class YumBase(depsolve.Depsolve): +@@ -4457,7 +5503,7 @@ class YumBase(depsolve.Depsolve): if e and v and r: evr = '%s:%s-%s' % (e, v, r) elif v and r: @@ -154060,7 +154273,7 @@ index 99039e0..198dc6d 100644 elif e and v: evr = '%s:%s' % (e, v) elif v: # e and r etc. is just too weird to print -@@ -4500,12 +5479,24 @@ class YumBase(depsolve.Depsolve): +@@ -4500,12 +5546,24 @@ class YumBase(depsolve.Depsolve): return returndict @@ -154088,7 +154301,7 @@ index 99039e0..198dc6d 100644 old_conf_obs = self.conf.obsoletes self.conf.obsoletes = False done = False -@@ -4515,19 +5506,46 @@ class YumBase(depsolve.Depsolve): +@@ -4515,19 +5573,46 @@ class YumBase(depsolve.Depsolve): done = True for pkg in transaction.trans_data: if pkg.state == 'Downgrade': @@ -154135,7 +154348,7 @@ index 99039e0..198dc6d 100644 if self.install(pkgtup=pkg.pkgtup): done = True for pkg in transaction.trans_data: -@@ -4538,8 +5556,14 @@ class YumBase(depsolve.Depsolve): +@@ -4538,8 +5623,14 @@ class YumBase(depsolve.Depsolve): return done def history_undo(self, transaction): @@ -154152,7 +154365,7 @@ index 99039e0..198dc6d 100644 # NOTE: This is somewhat basic atm. ... for instance we don't check # that we are going from the old new version. However it's still # better than the RHN rollback code, and people pay for that :). -@@ -4616,7 +5640,7 @@ class YumBase(depsolve.Depsolve): +@@ -4616,7 +5707,7 @@ class YumBase(depsolve.Depsolve): except urlgrabber.grabber.URLGrabError, e: raise Errors.YumBaseError(_('GPG key retrieval failed: ') + @@ -154161,7 +154374,7 @@ index 99039e0..198dc6d 100644 # check for a .asc file accompanying it - that's our gpg sig on the key # suck it down and do the check -@@ -4649,7 +5673,7 @@ class YumBase(depsolve.Depsolve): +@@ -4649,7 +5740,7 @@ class YumBase(depsolve.Depsolve): keys_info = misc.getgpgkeyinfo(rawkey, multiple=True) except ValueError, e: raise Errors.YumBaseError(_('Invalid GPG Key from %s: %s') % @@ -154170,7 +154383,7 @@ index 99039e0..198dc6d 100644 keys = [] for keyinfo in keys_info: thiskey = {} -@@ -4674,39 +5698,49 @@ class YumBase(depsolve.Depsolve): +@@ -4674,39 +5765,49 @@ class YumBase(depsolve.Depsolve): if pkgs: pkgs = sorted(pkgs)[-1] msg = (_('Importing %s key 0x%s:\n' @@ -154238,7 +154451,7 @@ index 99039e0..198dc6d 100644 user_cb_fail = False for keyurl in keyurls: keys = self._retrievePublicKey(keyurl, repo) -@@ -4725,7 +5759,9 @@ class YumBase(depsolve.Depsolve): +@@ -4725,7 +5826,9 @@ class YumBase(depsolve.Depsolve): # Try installing/updating GPG key self._getKeyImportMessage(info, keyurl) rc = False @@ -154249,7 +154462,7 @@ index 99039e0..198dc6d 100644 rc = True # grab the .sig/.asc for the keyurl, if it exists -@@ -4751,8 +5787,8 @@ class YumBase(depsolve.Depsolve): +@@ -4751,8 +5854,8 @@ class YumBase(depsolve.Depsolve): ts = self.rpmdb.readOnlyTS() result = ts.pgpImportPubkey(misc.procgpgkey(info['raw_key'])) if result != 0: @@ -154260,7 +154473,7 @@ index 99039e0..198dc6d 100644 self.logger.info(_('Key imported successfully')) key_installed = True -@@ -4760,18 +5796,20 @@ class YumBase(depsolve.Depsolve): +@@ -4760,18 +5863,20 @@ class YumBase(depsolve.Depsolve): raise Errors.YumBaseError, _("Didn't install any keys") if not key_installed: @@ -154286,7 +154499,7 @@ index 99039e0..198dc6d 100644 def _getAnyKeyForRepo(self, repo, destdir, keyurl_list, is_cakey=False, callback=None): """ -@@ -4788,6 +5826,18 @@ class YumBase(depsolve.Depsolve): +@@ -4788,6 +5893,18 @@ class YumBase(depsolve.Depsolve): """ key_installed = False @@ -154305,7 +154518,7 @@ index 99039e0..198dc6d 100644 user_cb_fail = False for keyurl in keyurl_list: keys = self._retrievePublicKey(keyurl, repo, getSig=not is_cakey) -@@ -4819,8 +5869,11 @@ class YumBase(depsolve.Depsolve): +@@ -4819,8 +5936,11 @@ class YumBase(depsolve.Depsolve): if not key_installed: self._getKeyImportMessage(info, keyurl, keytype) rc = False @@ -154318,7 +154531,7 @@ index 99039e0..198dc6d 100644 elif callback: rc = callback({"repo": repo, "userid": info['userid'], "hexkeyid": info['hexkeyid'], "keyurl": keyurl, -@@ -4835,7 +5888,8 @@ class YumBase(depsolve.Depsolve): +@@ -4835,7 +5955,8 @@ class YumBase(depsolve.Depsolve): # Import the key result = misc.import_key_to_pubring(info['raw_key'], info['hexkeyid'], gpgdir=destdir) if not result: @@ -154328,7 +154541,7 @@ index 99039e0..198dc6d 100644 self.logger.info(_('Key imported successfully')) key_installed = True # write out the key id to imported_cakeys in the repos basedir -@@ -4851,36 +5905,35 @@ class YumBase(depsolve.Depsolve): +@@ -4851,36 +5972,35 @@ class YumBase(depsolve.Depsolve): pass if not key_installed and user_cb_fail: @@ -154381,7 +154594,7 @@ index 99039e0..198dc6d 100644 self._getAnyKeyForRepo(repo, repo.gpgcadir, repo.gpgcakey, is_cakey=True, callback=callback) def _limit_installonly_pkgs(self): -@@ -4927,6 +5980,7 @@ class YumBase(depsolve.Depsolve): +@@ -4927,6 +6047,7 @@ class YumBase(depsolve.Depsolve): ts = self.rpmdb.readOnlyTS() (cur_kernel_v, cur_kernel_r) = misc.get_running_kernel_version_release(ts) install_only_names = set(self.conf.installonlypkgs) @@ -154389,7 +154602,7 @@ index 99039e0..198dc6d 100644 for m in self.tsInfo.getMembers(): if m.ts_state not in ('i', 'u'): continue -@@ -4937,12 +5991,21 @@ class YumBase(depsolve.Depsolve): +@@ -4937,12 +6058,21 @@ class YumBase(depsolve.Depsolve): if not po_names.intersection(install_only_names): continue @@ -154415,7 +154628,7 @@ index 99039e0..198dc6d 100644 for po in installed: if (po.version, po.release) == (cur_kernel_v, cur_kernel_r): # don't remove running -@@ -4959,19 +6022,22 @@ class YumBase(depsolve.Depsolve): +@@ -4959,19 +6089,22 @@ class YumBase(depsolve.Depsolve): txmbr.depends_on.append(rel) def processTransaction(self, callback=None,rpmTestDisplay=None, rpmDisplay=None): @@ -154451,7 +154664,7 @@ index 99039e0..198dc6d 100644 if not callback: callback = callbacks.ProcessTransNoOutputCallback() -@@ -5114,13 +6180,19 @@ class YumBase(depsolve.Depsolve): +@@ -5114,13 +6247,19 @@ class YumBase(depsolve.Depsolve): return results def add_enable_repo(self, repoid, baseurls=[], mirrorlist=None, **kwargs): @@ -154478,7 +154691,7 @@ index 99039e0..198dc6d 100644 # out of place fixme - maybe we should make this the default repo addition # routine and use it from getReposFromConfigFile(), etc. newrepo = yumRepo.YumRepository(repoid) -@@ -5167,9 +6239,15 @@ class YumBase(depsolve.Depsolve): +@@ -5167,9 +6306,15 @@ class YumBase(depsolve.Depsolve): def setCacheDir(self, force=False, tmpdir=None, reuse=True, suffix='/$basearch/$releasever'): @@ -154497,7 +154710,7 @@ index 99039e0..198dc6d 100644 if not force and os.geteuid() == 0: return True # We are root, not forced, so happy with the global dir. if tmpdir is None: -@@ -5179,7 +6257,7 @@ class YumBase(depsolve.Depsolve): +@@ -5179,7 +6324,7 @@ class YumBase(depsolve.Depsolve): try: cachedir = misc.getCacheDir(tmpdir, reuse) except (IOError, OSError), e: @@ -154506,7 +154719,7 @@ index 99039e0..198dc6d 100644 cachedir = None if cachedir is None: -@@ -5190,6 +6268,7 @@ class YumBase(depsolve.Depsolve): +@@ -5190,6 +6335,7 @@ class YumBase(depsolve.Depsolve): self.prerepoconf.cachedir = cachedir else: self.repos.setCacheDir(cachedir) @@ -154514,7 +154727,7 @@ index 99039e0..198dc6d 100644 self.conf.cachedir = cachedir return True # We got a new cache dir -@@ -5220,13 +6299,24 @@ class YumBase(depsolve.Depsolve): +@@ -5220,13 +6366,24 @@ class YumBase(depsolve.Depsolve): self.history.write_addon_data('config-repos', myrepos) def verify_plugins_cb(self, verify_package): @@ -154542,7 +154755,7 @@ index 99039e0..198dc6d 100644 if self.tsInfo._unresolvedMembers: if auto: self.logger.critical(_("Dependencies not solved. Will not save unresolved transaction.")) -@@ -5234,7 +6324,7 @@ class YumBase(depsolve.Depsolve): +@@ -5234,7 +6391,7 @@ class YumBase(depsolve.Depsolve): raise Errors.YumBaseError(_("Dependencies not solved. Will not save unresolved transaction.")) if not filename: @@ -154551,7 +154764,7 @@ index 99039e0..198dc6d 100644 fd,filename = tempfile.mkstemp(suffix='.yumtx', prefix=prefix) f = os.fdopen(fd, 'w') else: -@@ -5244,13 +6334,17 @@ class YumBase(depsolve.Depsolve): +@@ -5244,13 +6401,17 @@ class YumBase(depsolve.Depsolve): msg = "%s\n" % self.rpmdb.simpleVersion(main_only=True)[0] msg += "%s\n" % self.ts.getTsFlags() @@ -154572,7 +154785,7 @@ index 99039e0..198dc6d 100644 msg += "%s\n" % len(self.tsInfo.getMembers()) for txmbr in self.tsInfo.getMembers(): msg += txmbr._dump() -@@ -5260,13 +6354,25 @@ class YumBase(depsolve.Depsolve): +@@ -5260,13 +6421,25 @@ class YumBase(depsolve.Depsolve): except (IOError, OSError), e: self._ts_save_file = None if auto: @@ -154604,7 +154817,7 @@ index 99039e0..198dc6d 100644 # check rpmversion - if not match throw a fit # check repoversions (and repos)- if not match throw a fit # load each txmbr - if pkgs being updated don't exist, bail w/error -@@ -5276,26 +6382,45 @@ class YumBase(depsolve.Depsolve): +@@ -5276,26 +6449,45 @@ class YumBase(depsolve.Depsolve): try: data = open(filename, 'r').readlines() except (IOError, OSError), e: @@ -154652,7 +154865,7 @@ index 99039e0..198dc6d 100644 if ignorerpm: msg += _(" ignoring, as requested.") self.logger.critical(_(msg)) -@@ -5318,8 +6443,17 @@ class YumBase(depsolve.Depsolve): +@@ -5318,8 +6510,17 @@ class YumBase(depsolve.Depsolve): numrepos = int(data[2].strip()) repos = [] rindex=3+numrepos @@ -154671,7 +154884,7 @@ index 99039e0..198dc6d 100644 # pkgs/txmbrs numpkgs = int(data[rindex].strip()) -@@ -5329,6 +6463,7 @@ class YumBase(depsolve.Depsolve): +@@ -5329,6 +6530,7 @@ class YumBase(depsolve.Depsolve): pkgcount = 0 pkgprob = False curpkg = None @@ -154679,7 +154892,22 @@ index 99039e0..198dc6d 100644 for l in data[pkgstart:]: l = l.rstrip() # our main txmbrs -@@ -5438,6 +6573,11 @@ class YumBase(depsolve.Depsolve): +@@ -5356,6 +6558,7 @@ class YumBase(depsolve.Depsolve): + if not ignoremissing: + raise Errors.YumBaseError(msg) + else: ++ ignorenewrpm = True + self.logger.critical(msg) + else: + pkgcount += 1 +@@ -5432,12 +6635,18 @@ class YumBase(depsolve.Depsolve): + if pkgprob: + msg = _("Transaction members, relations are missing or ts has been modified,") + if ignoremissing: ++ ignorenewrpm = True + msg += _(" ignoring, as requested. You must redepsolve!") + self.logger.critical(msg) + else: msg += _(" aborting.") raise Errors.YumBaseError(msg) @@ -154691,7 +154919,7 @@ index 99039e0..198dc6d 100644 return self.tsInfo.getMembers() def _remove_old_deps(self): -@@ -5470,18 +6610,6 @@ class YumBase(depsolve.Depsolve): +@@ -5470,18 +6679,6 @@ class YumBase(depsolve.Depsolve): if requiring == required: # if they are self-requiring skip them continue @@ -154710,7 +154938,7 @@ index 99039e0..198dc6d 100644 #for tbi_pkg in self.tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES): # for reqtuple in tbi_pkg.po.requires: # if required.provides_for(reqtuple): -@@ -5533,7 +6661,24 @@ class YumBase(depsolve.Depsolve): +@@ -5533,7 +6730,24 @@ class YumBase(depsolve.Depsolve): # Debugging output self.verbose_logger.log(logginglevels.DEBUG_2, _("%s has revdep %s which was user-installed."), pkg, curpkg) ok_to_remove[pkg] = False @@ -154735,7 +154963,7 @@ index 99039e0..198dc6d 100644 visited[curpkg] = True all_leaves_visited = True leaves = curpkg.requiring_packages() -@@ -5547,4 +6692,3 @@ class YumBase(depsolve.Depsolve): +@@ -5547,4 +6761,3 @@ class YumBase(depsolve.Depsolve): # Debugging output self.verbose_logger.log(logginglevels.DEBUG_2, _("%s has no user-installed revdeps."), pkg) return False @@ -154888,7 +155116,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): @@ -155046,7 +155274,7 @@ index 65f6d5e..08e66b9 100755 + msg += """ \n""" + msg += """ \n""" + for grp in self.options: -+ msg += """ %s\n""" % grp ++ msg += """ %s\n""" % grp + msg += """ \n""" + msg += """ \n""" + @@ -155222,7 +155450,7 @@ index 65f6d5e..08e66b9 100755 print category.name for group in category.groups: diff --git a/yum/config.py b/yum/config.py -index d09511f..b81020f 100644 +index d09511f..74be397 100644 --- a/yum/config.py +++ b/yum/config.py @@ -45,15 +45,18 @@ from misc import get_uuid, read_in_items_from_dot_dir @@ -155493,12 +155721,12 @@ index d09511f..b81020f 100644 class PositiveIntOption(IntOption): - +- """ +- An option representing a positive integer value, where 0 can have a special +- represention. + """An option representing a positive integer value, where 0 can + have a special representation. """ -- An option representing a positive integer value, where 0 can have a special -- represention. -- """ - def __init__(self, default=None, range_min=0, range_max=None, names_of_0=None): @@ -155689,11 +155917,11 @@ index d09511f..b81020f 100644 - Invalid inputs: -10, -0.1, 45.6L, 123Mb - - Return value will always be an integer +- +- 1k = 1024 bytes. + Valid inputs: 100, 123M, 45.6k, 12.4G, 100K, 786.3, 0. + Invalid inputs: -10, -0.1, 45.6L, 123Mb. -- 1k = 1024 bytes. -- - ValueError will be raised if the option couldn't be parsed. + :param s: the string to parse + :return: the number of bytes represented by *s* @@ -156185,7 +156413,7 @@ index d09511f..b81020f 100644 try: val = conf.get(section, name) except (NoSectionError, NoOptionError): -@@ -1028,23 +1159,19 @@ def _getsysver(installroot, distroverpkg): +@@ -1028,25 +1159,28 @@ def _getsysver(installroot, distroverpkg): if idx.count() == 0: releasever = '$releasever' else: @@ -156212,10 +156440,20 @@ index d09511f..b81020f 100644 if not _use_iniparse: - return + return None ++ ++ if not hasattr(repo, 'repofile') or not repo.repofile: ++ return None ++ ++ try: ++ ini = INIConfig(open(repo.repofile)) ++ except: ++ return None - ini = INIConfig(open(repo.repofile)) +- ini = INIConfig(open(repo.repofile)) # b/c repoids can have $values in them we need to map both ways to figure -@@ -1054,6 +1181,19 @@ def writeRawRepoFile(repo,only=None): + # out which one is which + section_id = repo.id +@@ -1054,6 +1188,19 @@ def writeRawRepoFile(repo,only=None): for sect in ini._sections.keys(): if varReplace(sect, repo.yumvar) == repo.id: section_id = sect @@ -156235,7 +156473,7 @@ index d09511f..b81020f 100644 # Updated the ConfigParser with the changed values cfgOptions = repo.cfg.options(repo.id) -@@ -1069,7 +1209,7 @@ def writeRawRepoFile(repo,only=None): +@@ -1069,7 +1216,7 @@ def writeRawRepoFile(repo,only=None): # If the value is the same, but just interpreted ... when we don't want # to keep the interpreted values. if (name in ini[section_id] and @@ -157642,7 +157880,7 @@ index 0000000..6a04f3a + + return returns.values() diff --git a/yum/metalink.py b/yum/metalink.py -index aaa4f25..51895fd 100755 +index aaa4f25..61aa586 100755 --- a/yum/metalink.py +++ b/yum/metalink.py @@ -180,6 +180,7 @@ class MetaLinkRepoMD: @@ -157670,12 +157908,12 @@ index aaa4f25..51895fd 100755 + if host in self._host2mc: continue - hosts.add(host) -+ self._host2mc[host] = mirror.max_connections ++ self._host2mc[host] = mirror else: continue diff --git a/yum/misc.py b/yum/misc.py -index 2f6ddfe..4cae42b 100644 +index 2f6ddfe..a0bac7b 100644 --- a/yum/misc.py +++ b/yum/misc.py @@ -8,6 +8,7 @@ import os @@ -157694,7 +157932,27 @@ index 2f6ddfe..4cae42b 100644 _available_compression = ['gz', 'bz2'] try: import lzma -@@ -410,6 +412,17 @@ def procgpgkey(rawkey): +@@ -95,6 +97,19 @@ def re_glob(s): + _re_compiled_glob_match = re.compile('[*?]|\[.+\]').search + return _re_compiled_glob_match(s) + ++def compile_pattern(pat, ignore_case=False): ++ """ Compile shell wildcards, return a 'match' function. """ ++ if re_glob(pat): ++ try: ++ flags = ignore_case and re.I or 0 ++ return re.compile(fnmatch.translate(pat), flags).match ++ except re.error: ++ pass # fall back to exact match ++ if ignore_case: ++ pat = pat.lower() ++ return lambda s: s.lower() == pat ++ return lambda s: s == pat ++ + _re_compiled_filename_match = None + def re_filename(s): + """ Tests if a string could be a filename. We still get negated character +@@ -410,6 +425,17 @@ def procgpgkey(rawkey): # Decode and return return base64.decodestring(block.getvalue()) @@ -157712,7 +157970,7 @@ index 2f6ddfe..4cae42b 100644 def getgpgkeyinfo(rawkey, multiple=False): '''Return a dict of info for the given ASCII armoured key text -@@ -611,6 +624,8 @@ def getCacheDir(tmpdir='/var/tmp', reuse=True, prefix='yum-'): +@@ -611,6 +637,8 @@ def getCacheDir(tmpdir='/var/tmp', reuse=True, prefix='yum-'): try: usertup = pwd.getpwuid(uid) username = usertup[0] @@ -157721,16 +157979,19 @@ index 2f6ddfe..4cae42b 100644 except KeyError: return None # if it returns None then, well, it's bollocksed -@@ -746,6 +761,8 @@ def _decompress_chunked(source, dest, ztype): +@@ -744,8 +772,9 @@ def _decompress_chunked(source, dest, ztype): + while True: + try: data = s_fn.read(1024000) - except IOError: - break -+ except EOFError: -+ break +- except IOError: +- break ++ except (OSError, IOError, EOFError), e: ++ msg = "Error reading from file %s: %s" % (source, str(e)) ++ raise Errors.MiscError, msg if not data: break -@@ -940,14 +957,16 @@ def unlink_f(filename): +@@ -940,14 +969,16 @@ def unlink_f(filename): if e.errno != errno.ENOENT: raise @@ -157751,7 +158012,7 @@ index 2f6ddfe..4cae42b 100644 def _getloginuid(): """ Get the audit-uid/login-uid, if available. None is returned if there -@@ -992,9 +1011,17 @@ def setup_locale(override_codecs=True, override_time=False): +@@ -992,9 +1023,17 @@ def setup_locale(override_codecs=True, override_time=False): locale.setlocale(locale.LC_ALL, 'C') if override_codecs: @@ -157772,7 +158033,7 @@ index 2f6ddfe..4cae42b 100644 def get_my_lang_code(): -@@ -1105,17 +1132,28 @@ def decompress(filename, dest=None, fn_only=False, check_timestamps=False): +@@ -1105,17 +1144,28 @@ def decompress(filename, dest=None, fn_only=False, check_timestamps=False): out = filename.replace('.xz', '') else: @@ -157809,11 +158070,55 @@ index 2f6ddfe..4cae42b 100644 return out +@@ -1123,11 +1173,7 @@ def repo_gen_decompress(filename, generated_name, cached=False): + """ This is a wrapper around decompress, where we work out a cached + generated name, and use check_timestamps. filename _must_ be from + a repo. and generated_name is the type of the file. """ +- dest = os.path.dirname(filename) +- dest += '/gen' +- if not os.path.exists(dest): +- os.makedirs(dest, mode=0755) +- dest += '/' + generated_name ++ dest = os.path.dirname(filename) + '/gen/' + generated_name + return decompress(filename, dest=dest, check_timestamps=True,fn_only=cached) + + def read_in_items_from_dot_dir(thisglob, line_as_list=True): diff --git a/yum/packageSack.py b/yum/packageSack.py -index 4af563a..47832fc 100644 +index 4af563a..a702ac1 100644 --- a/yum/packageSack.py +++ b/yum/packageSack.py -@@ -445,6 +445,7 @@ class MetaSack(PackageSackBase): +@@ -282,11 +282,7 @@ class PackageSackBase(object): + + specs = {} + for p in pkgspecs: +- if misc.re_glob(p): +- restring = fnmatch.translate(p) +- specs[p] = re.compile(restring) +- else: +- specs[p] = p ++ specs[p] = misc.compile_pattern(p) + + # We don't use simplePkgList() here because that loads all of the + # rpmdb, if we are Eg. doing a "remove PackageKit". +@@ -304,13 +300,12 @@ class PackageSackBase(object): + )) + + for (term,query) in specs.items(): +- if term == query: +- if query in names: +- exactmatch.append(self.searchPkgTuple(pkgtup)[0]) +- unmatched.discard(term) ++ if term in names: ++ exactmatch.append(self.searchPkgTuple(pkgtup)[0]) ++ unmatched.discard(term) + else: + for n in names: +- if query.match(n): ++ if query(n): + matched.append(self.searchPkgTuple(pkgtup)[0]) + unmatched.discard(term) + return misc.unique(exactmatch), misc.unique(matched), list(unmatched) +@@ -445,6 +440,7 @@ class MetaSack(PackageSackBase): nobsdict = {} last_name = '' last_pkg = None @@ -157821,7 +158126,7 @@ index 4af563a..47832fc 100644 # It takes about 0.2 of a second to convert these into packages, just # so we can sort them, which is ~40% of this functions time. So we sort # the pkgtups "by hand". -@@ -624,6 +625,8 @@ class MetaSack(PackageSackBase): +@@ -624,6 +620,8 @@ class MetaSack(PackageSackBase): class PackageSack(PackageSackBase): """represents sets (sacks) of Package Objects""" def __init__(self): @@ -157831,7 +158136,7 @@ index 4af563a..47832fc 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..f67169f 100644 +index 5ef9951..7a2624a 100644 --- a/yum/packages.py +++ b/yum/packages.py @@ -106,14 +106,16 @@ def buildPkgRefDict(pkgs, casematch=True): @@ -157853,7 +158158,32 @@ index 5ef9951..f67169f 100644 exactmatch = [] matched = [] unmatched = [] -@@ -243,34 +245,87 @@ class PackageObject(object): +@@ -130,11 +132,10 @@ def parsePackages(pkgs, usercommands, casematch=0, + trylist = pkgdict.keys() + # command and pkgdict are already lowered if not casematch + # so case sensitive is always fine +- restring = fnmatch.translate(command) +- regex = re.compile(restring) ++ regex = misc.compile_pattern(command) + foundit = 0 + for item in trylist: +- if regex.match(item): ++ if regex(item): + matched.extend(pkgdict[item]) + del pkgdict[item] + foundit = 1 +@@ -223,6 +224,10 @@ class FakeRepository: + def __str__(self): + return self.id + ++ def _ui_id(self): ++ return self.id ++ ui_id = property(fget=lambda self: self._ui_id()) ++ + + # Goal for the below is to have a packageobject that can be used by generic + # functions independent of the type of package - ie: installed or available +@@ -243,34 +248,87 @@ class PackageObject(object): def _ui_envra(self): if self.epoch == '0': @@ -157961,7 +158291,7 @@ index 5ef9951..f67169f 100644 def __str__(self): return self.ui_envra -@@ -481,15 +536,14 @@ class RpmBase(object): +@@ -481,15 +539,14 @@ class RpmBase(object): if prcotuple in self._prco_lookup[prcotype]: return 1 @@ -157985,7 +158315,7 @@ index 5ef9951..f67169f 100644 return 0 -@@ -611,15 +665,18 @@ class RpmBase(object): +@@ -611,15 +668,18 @@ class RpmBase(object): dirlist = property(fget=lambda self: self.returnFileEntries(ftype='dir')) ghostlist = property(fget=lambda self: self.returnFileEntries(ftype='ghost')) requires = property(fget=lambda self: self.returnPrco('requires')) @@ -158004,7 +158334,7 @@ index 5ef9951..f67169f 100644 conflicts_print = property(fget=lambda self: self.returnPrco('conflicts', True)) obsoletes_print = property(fget=lambda self: self.returnPrco('obsoletes', True)) changelog = property(fget=lambda self: self.returnChangelog()) -@@ -1083,7 +1140,7 @@ class YumAvailablePackage(PackageObject, RpmBase): +@@ -1083,7 +1143,7 @@ class YumAvailablePackage(PackageObject, RpmBase): misc.to_unicode(misc.to_xml(self.summary)), misc.to_unicode(misc.to_xml(self.description)), packager, url, self.filetime, @@ -158013,7 +158343,7 @@ index 5ef9951..f67169f 100644 msg += self._return_remote_location() return msg -@@ -1133,7 +1190,7 @@ class YumAvailablePackage(PackageObject, RpmBase): +@@ -1133,7 +1193,7 @@ class YumAvailablePackage(PackageObject, RpmBase): msg = "" mylist = getattr(self, pcotype) if mylist: msg = "\n \n" % pcotype @@ -158022,7 +158352,7 @@ index 5ef9951..f67169f 100644 pcostring = ''' %s\n""" % misc.to_xml(fn) return msg -@@ -1194,8 +1251,8 @@ class YumAvailablePackage(PackageObject, RpmBase): +@@ -1194,8 +1254,8 @@ class YumAvailablePackage(PackageObject, RpmBase): continue newlist.append(i) mylist = newlist @@ -158048,7 +158378,7 @@ index 5ef9951..f67169f 100644 if name.startswith('rpmlib('): continue # this drops out requires that the pkg provides for itself. -@@ -1217,13 +1274,16 @@ class YumAvailablePackage(PackageObject, RpmBase): +@@ -1217,13 +1277,16 @@ class YumAvailablePackage(PackageObject, RpmBase): prcostring += ''' ver="%s"''' % misc.to_xml(v, attrib=True) if r: prcostring += ''' rel="%s"''' % misc.to_xml(r, attrib=True) @@ -158067,7 +158397,7 @@ index 5ef9951..f67169f 100644 return msg def _dump_changelog(self, clog_limit): -@@ -1272,6 +1332,13 @@ class YumAvailablePackage(PackageObject, RpmBase): +@@ -1272,6 +1335,13 @@ class YumAvailablePackage(PackageObject, RpmBase): return misc.to_utf8(msg) @@ -158081,7 +158411,7 @@ index 5ef9951..f67169f 100644 # This is a tweak on YumAvailablePackage() and is a base class for packages # which are actual rpms. -@@ -1299,7 +1366,8 @@ class YumHeaderPackage(YumAvailablePackage): +@@ -1299,7 +1369,8 @@ class YumHeaderPackage(YumAvailablePackage): self.pkgid = self.hdr[rpm.RPMTAG_SHA1HEADER] if not self.pkgid: self.pkgid = "%s.%s" %(self.hdr['name'], self.hdr['buildtime']) @@ -158091,7 +158421,7 @@ index 5ef9951..f67169f 100644 self.__mode_cache = {} self.__prcoPopulated = False -@@ -1353,6 +1421,12 @@ class YumHeaderPackage(YumAvailablePackage): +@@ -1353,6 +1424,12 @@ class YumHeaderPackage(YumAvailablePackage): continue lst = hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)] @@ -158104,7 +158434,7 @@ index 5ef9951..f67169f 100644 flag = map(rpmUtils.miscutils.flagToString, lst) flag = map(misc.share_data, flag) -@@ -1363,6 +1437,10 @@ class YumHeaderPackage(YumAvailablePackage): +@@ -1363,6 +1440,10 @@ class YumHeaderPackage(YumAvailablePackage): prcotype = tag2prco[tag] self.prco[prcotype] = map(misc.share_data, zip(name,flag,vers)) @@ -158115,7 +158445,7 @@ index 5ef9951..f67169f 100644 def tagByName(self, tag): warnings.warn("tagByName() will go away in a furture version of Yum.\n", -@@ -1447,7 +1525,7 @@ class YumHeaderPackage(YumAvailablePackage): +@@ -1447,7 +1528,7 @@ class YumHeaderPackage(YumAvailablePackage): raise NotImplementedError() def _size(self): @@ -158729,7 +159059,7 @@ index 31b1080..eb84123 100755 tags += """ \n""" msg += tags diff --git a/yum/repos.py b/yum/repos.py -index 3793bad..6d4c20e 100644 +index 3793bad..de5da1e 100644 --- a/yum/repos.py +++ b/yum/repos.py @@ -22,6 +22,7 @@ import misc @@ -158788,15 +159118,21 @@ index 3793bad..6d4c20e 100644 def doSetup(self, thisrepo = None): self.ayum.plugins.run('prereposetup') -@@ -89,6 +131,7 @@ class RepoStorage: +@@ -87,8 +129,13 @@ class RepoStorage: + # so nothing else touches us + if not repo.enabled: self.disableRepo(repo.id) ++ else: ++ pkgdir = getattr(self.ayum.conf, 'downloaddir', None) ++ if pkgdir: ++ repo.pkgdir = pkgdir self._setup = True + self.retrieveAllMD() self.ayum.plugins.run('postreposetup') def __str__(self): -@@ -223,15 +266,16 @@ class RepoStorage: +@@ -223,15 +270,16 @@ class RepoStorage: self._cachedir = cachedir for repo in self.repos.values(): @@ -158817,7 +159153,7 @@ index 3793bad..6d4c20e 100644 def setFailureCallback(self, obj): """sets the failure callback for all repos""" -@@ -288,6 +332,16 @@ class RepoStorage: +@@ -288,6 +336,16 @@ class RepoStorage: else: data = [ mdtype ] @@ -158835,7 +159171,7 @@ index 3793bad..6d4c20e 100644 sack = repo.getPackageSack() try: diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index e289a7a..a4da4ab 100644 +index e289a7a..302f613 100644 --- a/yum/rpmsack.py +++ b/yum/rpmsack.py @@ -48,6 +48,17 @@ def _open_no_umask(*args): @@ -158875,7 +159211,53 @@ index e289a7a..a4da4ab 100644 continue pkg = pkg[0] -@@ -616,7 +628,7 @@ class RPMDBPackageSack(PackageSackBase): +@@ -534,13 +546,11 @@ class RPMDBPackageSack(PackageSackBase): + qpat = pat[0] + if qpat in ('?', '*', '['): + qpat = None +- if ignore_case: +- if qpat is not None: +- qpat = qpat.lower() +- ret.append((qpat, re.compile(fnmatch.translate(pat), re.I))) +- else: +- ret.append((qpat, re.compile(fnmatch.translate(pat)))) ++ elif ignore_case: ++ qpat = qpat.lower() ++ ret.append((qpat, misc.compile_pattern(pat, ignore_case))) + return ret ++ + @staticmethod + def _match_repattern(repatterns, hdr, ignore_case): + """ This is basically parsePackages() but for rpm hdr objects. """ +@@ -558,20 +568,20 @@ class RPMDBPackageSack(PackageSackBase): + qname = qname.lower() + if qpat is not None and qpat != qname and qpat != epoch[0]: + continue +- if repat.match(hdr['name']): ++ if repat(hdr['name']): + return True +- if repat.match("%(name)s-%(version)s-%(release)s.%(arch)s" % hdr): ++ if repat("%(name)s-%(version)s-%(release)s.%(arch)s" % hdr): + return True +- if repat.match("%(name)s.%(arch)s" % hdr): ++ if repat("%(name)s.%(arch)s" % hdr): + return True +- if repat.match("%(name)s-%(version)s" % hdr): ++ if repat("%(name)s-%(version)s" % hdr): + return True +- if repat.match("%(name)s-%(version)s-%(release)s" % hdr): ++ if repat("%(name)s-%(version)s-%(release)s" % hdr): + return True +- if repat.match(epoch + ":%(name)s-%(version)s-%(release)s.%(arch)s" ++ if repat(epoch + ":%(name)s-%(version)s-%(release)s.%(arch)s" + % hdr): + return True +- if repat.match("%(name)s-%(epoch)s:%(version)s-%(release)s.%(arch)s" ++ if repat("%(name)s-%(epoch)s:%(version)s-%(release)s.%(arch)s" + % hdr): + return True + return False +@@ -616,7 +626,7 @@ class RPMDBPackageSack(PackageSackBase): for hdr, idx in self._get_packages(): if self._match_repattern(rpats, hdr, ignore_case): self._makePackageObject(hdr, idx) @@ -158884,7 +159266,7 @@ index e289a7a..a4da4ab 100644 pkgobjlist = self._idx2pkg.values() # Remove gpg-pubkeys, as no sane callers expects/likes them... -@@ -993,7 +1005,7 @@ class RPMDBPackageSack(PackageSackBase): +@@ -993,7 +1003,7 @@ class RPMDBPackageSack(PackageSackBase): return if not load_packages: @@ -158893,7 +159275,7 @@ index e289a7a..a4da4ab 100644 for pkgtup in checksum_data: if checksum_data[pkgtup] is None: -@@ -1002,7 +1014,8 @@ class RPMDBPackageSack(PackageSackBase): +@@ -1002,7 +1012,8 @@ class RPMDBPackageSack(PackageSackBase): (n, a, e, v, r) = pkgtup pkg = self.searchNevra(n, e, v, r, a) if not pkg: @@ -158903,7 +159285,7 @@ index e289a7a..a4da4ab 100644 continue pkg = pkg[0] (T, D) = checksum_data[pkgtup] -@@ -1088,7 +1101,7 @@ class RPMDBPackageSack(PackageSackBase): +@@ -1088,7 +1099,7 @@ class RPMDBPackageSack(PackageSackBase): return try: @@ -158912,7 +159294,7 @@ index e289a7a..a4da4ab 100644 except (IOError, OSError), e: return -@@ -1456,7 +1469,7 @@ class RPMDBPackageSack(PackageSackBase): +@@ -1456,7 +1467,7 @@ class RPMDBPackageSack(PackageSackBase): providers = set() # Speedup, as usual :) problems = [] for pkg in sorted(pkgs): # The sort here is mainly for "UI" @@ -158921,7 +159303,7 @@ index e289a7a..a4da4ab 100644 if rreq[0].startswith('rpmlib'): continue if rreq in providers: continue -@@ -1562,11 +1575,11 @@ class RPMDBAdditionalData(object): +@@ -1562,11 +1573,11 @@ class RPMDBAdditionalData(object): self._packages = {} # pkgid = dir if not os.path.exists(self.conf.db_path): try: @@ -158936,7 +159318,7 @@ index e289a7a..a4da4ab 100644 else: if os.access(self.conf.db_path, os.W_OK): self.conf.writable = True -@@ -1622,6 +1635,7 @@ class RPMDBAdditionalDataPackage(object): +@@ -1622,6 +1633,7 @@ class RPMDBAdditionalDataPackage(object): 'installed_by', 'changed_by', 'from_repo', 'from_repo_revision', 'from_repo_timestamp', 'releasever', @@ -158944,7 +159326,7 @@ index e289a7a..a4da4ab 100644 'command_line']) def __init__(self, conf, pkgdir, yumdb_cache=None): -@@ -1708,7 +1722,7 @@ class RPMDBAdditionalDataPackage(object): +@@ -1708,7 +1720,7 @@ class RPMDBAdditionalDataPackage(object): def _write(self, attr, value): # check for self._conf.writable before going on? if not os.path.exists(self._mydir): @@ -158953,7 +159335,7 @@ index e289a7a..a4da4ab 100644 attr = _sanitize(attr) if attr in self._read_cached_data: -@@ -1753,7 +1767,7 @@ class RPMDBAdditionalDataPackage(object): +@@ -1753,7 +1765,7 @@ class RPMDBAdditionalDataPackage(object): if attr.endswith('.tmp'): raise AttributeError, "%s has no attribute %s" % (self, attr) @@ -158963,7 +159345,7 @@ index e289a7a..a4da4ab 100644 raise AttributeError, "%s has no attribute %s" % (self, attr) diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py -index 9b265f9..61c9a0e 100644 +index 9b265f9..74a0f3f 100644 --- a/yum/rpmtrans.py +++ b/yum/rpmtrans.py @@ -119,7 +119,11 @@ class RPMBaseCallback: @@ -159017,8 +159399,11 @@ index 9b265f9..61c9a0e 100644 def _transStart(self, bytes, total, h): -@@ -621,3 +638,16 @@ class RPMTransaction: +@@ -619,5 +636,19 @@ class RPMTransaction: + msg = ("Non-fatal %s scriptlet failure in rpm package %s" % + (scriptlet_name, package_name)) self.display.errorlog(msg) ++ self._scriptout(package_name) # FIXME - what else should we do here? raise a failure and abort? + def _scriptStart(self, bytes, total, h): @@ -159035,9 +159420,27 @@ index 9b265f9..61c9a0e 100644 + + self.display.verify_txmbr(self.base, txmbr, count) diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py -index 8a6f6f3..ba929de 100644 +index 8a6f6f3..a955895 100644 --- a/yum/sqlitesack.py +++ b/yum/sqlitesack.py +@@ -69,7 +69,7 @@ def _parse_pkg_n(match, regexp_match, n): + if not regexp_match: + return False + +- if (match and n and match[0] not in ('?', '*') and match[0] != n[0]): ++ if (match and n and match[0] not in ('?', '*', '[') and match[0] != n[0]): + return False + if regexp_match(n): + return True +@@ -82,7 +82,7 @@ def _parse_pkg(match, regexp_match, data, e,v,r,a): + # Worthless speed hacks? + if match == n: + return True +- if (match and n and match[0] not in ('?', '*') and ++ if (match and n and match[0] not in ('?', '*', '[') and + match[0] != n[0] and match[0] != e[0]): + return False + @@ -382,6 +382,10 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase): def returnPrco(self, prcotype, printable=False): @@ -159068,6 +159471,31 @@ index 8a6f6f3..ba929de 100644 if len(self.filelistsdb) == 0: # grab repo object from primarydb and force filelists population in this sack using repo +@@ -1560,7 +1563,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + patterns = tmp + return (need_full, patterns, fields, False) + +- @catchSqliteException ++ # @catchSqliteException has no effect on generators + def _yieldSQLDataList(self, repoid, patterns, fields, ignore_case): + """Yields all the package data for the given params. Excludes are done + at this stage. """ +@@ -1593,6 +1596,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + for x in cur: + yield (repo, x) + ++ @catchSqliteException + def _buildPkgObjList(self, repoid=None, patterns=None, ignore_case=False): + """Builds a list of packages, only containing nevra information. + Excludes are done at this stage. """ +@@ -1666,6 +1670,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): + + return returnList + ++ @catchSqliteException + def simplePkgList(self, patterns=None, ignore_case=False): + """Returns a list of pkg tuples (n, a, e, v, r), optionally from a + single repoid. Note that the packages are always filtered to those diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py index 4d89d83..e7377bf 100644 --- a/yum/transactioninfo.py @@ -159301,7 +159729,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..fc2614e 100644 +index e5e9ece..e362c43 100644 --- a/yum/yumRepo.py +++ b/yum/yumRepo.py @@ -20,10 +20,12 @@ import time @@ -159325,6 +159753,15 @@ index e5e9ece..fc2614e 100644 from constants import * import metalink +@@ -104,7 +107,7 @@ class YumPackageSack(packageSack.PackageSack): + if repo in self.added: + if 'metadata' not in self.added[repo]: + raise Errors.RepoError, '%s md for %s imported before primary' \ +- % (datatype, repo.id) ++ % (datatype, repo.ui_id) + current = 0 + for pkgid in dataobj: + current += 1 @@ -121,6 +124,25 @@ class YumPackageSack(packageSack.PackageSack): # umm, wtf? pass @@ -159386,7 +159823,7 @@ index e5e9ece..fc2614e 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) @@ -159400,7 +159837,7 @@ index e5e9ece..fc2614e 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) @@ -159502,16 +159939,18 @@ index e5e9ece..fc2614e 100644 def close(self): if self._sack is not None: self.sack.close() -@@ -350,7 +434,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -350,6 +434,10 @@ class YumRepository(Repository, config.RepoConf): return thisdata.location def __str__(self): -- return self.id -+ return self.ui_id ++ # Note: You might expect this to be .ui_id, except people got used to ++ # the fact that str(repo) == repo.id and used the former instead of ++ # the later when they wanted just the .id. So we have to live with it ++ # and use .ui_id explicitly. + return self.id def _checksum(self, sumtype, file, CHUNK=2**16, checksum_can_fail=False, - datasize=None): -@@ -378,7 +462,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -378,7 +466,7 @@ class YumRepository(Repository, config.RepoConf): 'basecachedir', 'http_headers', 'metadata_cookie', 'metadata_cookie_fn', 'quick_enable_disable', 'repoMDFile', 'timestamp_check', 'urls', 'mirrorurls', @@ -159520,7 +159959,16 @@ index e5e9ece..fc2614e 100644 for attr in dir(self): if attr.startswith('_'): continue -@@ -431,25 +515,18 @@ class YumRepository(Repository, config.RepoConf): +@@ -422,7 +510,7 @@ class YumRepository(Repository, config.RepoConf): + on then raise a repo error""" + if len(self._urls) < 1 and not self.mediaid: + raise Errors.RepoError, \ +- 'Cannot find a valid baseurl for repo: %s' % self.id ++ 'Cannot find a valid baseurl for repo: %s' % self.ui_id + + def doProxyDict(self): + if self._proxy_dict: +@@ -431,25 +519,18 @@ class YumRepository(Repository, config.RepoConf): self._proxy_dict = {} # zap it proxy_string = None empty = (None, '_none_', '') @@ -159554,7 +160002,7 @@ index e5e9ece..fc2614e 100644 if proxy_string is not None: self._proxy_dict['http'] = proxy_string -@@ -483,13 +560,26 @@ class YumRepository(Repository, config.RepoConf): +@@ -483,13 +564,30 @@ class YumRepository(Repository, config.RepoConf): ugopts = self._default_grabopts() self._grabfunc = URLGrabber(progress_obj=self.callback, @@ -159565,12 +160013,16 @@ index e5e9ece..fc2614e 100644 reget='simple', **ugopts) + def add_mc(url): -+ host = urlparse.urlsplit(url).netloc ++ host = urlparse.urlsplit(url).netloc.split('@')[-1] + mc = self.metalink_data._host2mc.get(host) -+ if mc > 0: ++ if mc: + url = { + 'mirror': misc.to_utf8(url), -+ 'kwargs': { 'max_connections': mc }, ++ 'kwargs': { ++ 'max_connections': mc.max_connections, ++ 'preference': mc.preference, ++ 'private': mc.private, ++ }, + } + return url + urls = self.urls @@ -159582,7 +160034,7 @@ index e5e9ece..fc2614e 100644 failure_callback=self.mirror_failure_obj) def _default_grabopts(self, cache=True): -@@ -499,6 +589,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -499,6 +597,7 @@ class YumRepository(Repository, config.RepoConf): 'throttle': self.throttle, 'proxies': self.proxy_dict, 'timeout': self.timeout, @@ -159590,7 +160042,16 @@ index e5e9ece..fc2614e 100644 'http_headers': tuple(self.__headersListFromDict(cache=cache)), 'ssl_verify_peer': self.sslverify, 'ssl_verify_host': self.sslverify, -@@ -714,10 +805,10 @@ class YumRepository(Repository, config.RepoConf): +@@ -561,7 +660,7 @@ class YumRepository(Repository, config.RepoConf): + cookie = self.cachedir + '/' + self.metadata_cookie_fn + self.setAttribute('_dir_setup_metadata_cookie', cookie) + +- for dir in [self.cachedir, self.pkgdir]: ++ for dir in [self.cachedir, self.cachedir + '/gen', self.pkgdir]: + self._dirSetupMkdir_p(dir) + + # persistdir is really root-only but try the make anyway and just +@@ -714,15 +813,15 @@ class YumRepository(Repository, config.RepoConf): local = self.metalink_filename + '.tmp' if not self._metalinkCurrent(): url = misc.to_utf8(self.metalink) @@ -159599,12 +160060,34 @@ index e5e9ece..fc2614e 100644 try: ug = URLGrabber(progress_obj = self.callback, **ugopts) - result = ug.urlgrab(url, local, text=self.id + "/metalink") -+ result = ug.urlgrab(url, local, text=str(self) +"/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): -@@ -751,7 +842,7 @@ class YumRepository(Repository, config.RepoConf): + msg = ("Cannot retrieve metalink for repository: %s. " +- "Please verify its path and try again" % self ) ++ "Please verify its path and try again" % self.ui_id ) + raise Errors.RepoError, msg + # Now, we have an old usable metalink, so we can't move to + # a newer repomd.xml ... or checksums won't match. +@@ -749,9 +848,22 @@ class YumRepository(Repository, config.RepoConf): + value), + fdel=lambda self: setattr(self, "_metalink", None)) ++ def _all_urls_are_files(self, url): ++ if url: ++ return url.startswith("/") or url.startswith("file:") ++ ++ if not self.urls: # WTF ... but whatever. ++ return False ++ ++ # Not an explicit url ... so make sure all mirrors/etc. are file:// ++ for url in self.urls: ++ if not self._all_urls_are_files(url): ++ return False ++ return True ++ def _getFile(self, url=None, relative=None, local=None, start=None, end=None, copy_local=None, checkfunc=None, text=None, reget='simple', - cache=True, size=None): @@ -159612,20 +160095,29 @@ index e5e9ece..fc2614e 100644 """retrieve file from the mirrorgroup for the repo relative to local, optionally get range from start to end, also optionally retrieve from a specific baseurl""" -@@ -768,7 +859,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -768,7 +880,7 @@ class YumRepository(Repository, config.RepoConf): if local is None or relative is None: raise Errors.RepoError, \ - "get request for Repo %s, gave no source or dest" % self.id -+ "get request for Repo %s, gave no source or dest" % self ++ "get request for Repo %s, gave no source or dest" % self.ui_id if self.cache == 1: if os.path.exists(local): # FIXME - we should figure out a way -@@ -796,6 +887,16 @@ class YumRepository(Repository, config.RepoConf): +@@ -778,7 +890,7 @@ class YumRepository(Repository, config.RepoConf): + raise Errors.RepoError, \ + "Caching enabled but no local cache of %s from %s" % (local, + +- self) ++ self.ui_id) + + if url: + (scheme, netloc, path, query, fragid) = urlparse.urlsplit(url) +@@ -796,6 +908,16 @@ class YumRepository(Repository, config.RepoConf): except Errors.MediaError, e: verbose_logger.log(logginglevels.DEBUG_2, "Error getting package from media; falling back to url %s" %(e,)) -+ if size: ++ if size and (copy_local or not self._all_urls_are_files(url)): + dirstat = os.statvfs(os.path.dirname(local)) + avail = dirstat.f_bavail * dirstat.f_bsize + if avail < long(size): @@ -159638,7 +160130,7 @@ index e5e9ece..fc2614e 100644 if url and scheme != "media": ugopts = self._default_grabopts(cache=cache) ug = URLGrabber(progress_obj = self.callback, -@@ -815,14 +916,11 @@ class YumRepository(Repository, config.RepoConf): +@@ -815,14 +937,11 @@ class YumRepository(Repository, config.RepoConf): range=(start, end), ) except URLGrabError, e: @@ -159655,7 +160147,7 @@ index e5e9ece..fc2614e 100644 else: -@@ -835,19 +933,18 @@ class YumRepository(Repository, config.RepoConf): +@@ -835,19 +954,18 @@ class YumRepository(Repository, config.RepoConf): reget = reget, checkfunc=checkfunc, http_headers=headers, @@ -159681,13 +160173,16 @@ index e5e9ece..fc2614e 100644 remote = package.relativepath local = package.localPkg() basepath = package.basepath -@@ -857,15 +954,26 @@ class YumRepository(Repository, config.RepoConf): +@@ -857,15 +975,29 @@ class YumRepository(Repository, config.RepoConf): return local misc.unlink_f(local) - return self._getFile(url=basepath, + if checkfunc is None: -+ checkfunc = lambda obj: package.verifyLocalPkg() ++ def checkfunc(obj): ++ if not package.verifyLocalPkg(): ++ misc.unlink_f(local) ++ raise URLGrabError(-1, _('Package does not match intended download.')) + + ret = self._getFile(url=basepath, relative=remote, @@ -159709,7 +160204,16 @@ index e5e9ece..fc2614e 100644 def getHeader(self, package, checkfunc = None, reget = 'simple', cache = True): -@@ -1020,7 +1128,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -991,7 +1123,7 @@ class YumRepository(Repository, config.RepoConf): + def _cachingRepoXML(self, local): + """ Should we cache the current repomd.xml """ + if self.cache and not os.path.exists(local): +- raise Errors.RepoError, 'Cannot find repomd.xml file for %s' % self ++ raise Errors.RepoError, 'Cannot find repomd.xml file for %s' % self.ui_id + if self.cache or self.metadataCurrent(): + return True + return False +@@ -1020,7 +1152,7 @@ class YumRepository(Repository, config.RepoConf): if grab_can_fail: return None raise Errors.RepoError, 'Error downloading file %s: %s' % (local, e) @@ -159718,7 +160222,25 @@ index e5e9ece..fc2614e 100644 misc.unlink_f(tfname) if grab_can_fail: return None -@@ -1260,6 +1368,9 @@ class YumRepository(Repository, config.RepoConf): +@@ -1047,7 +1179,7 @@ class YumRepository(Repository, config.RepoConf): + parse_can_fail = 'old_repo_XML' in self._oldRepoMDData + if parse_can_fail: + return None +- raise Errors.RepoError, 'Error importing repomd.xml from %s: %s' % (self, e) ++ raise Errors.RepoError, 'Error importing repomd.xml from %s: %s' % (self.ui_id, e) + + def _saveOldRepoXML(self, local): + """ If we have an older repomd.xml file available, save it out. """ +@@ -1074,7 +1206,7 @@ class YumRepository(Repository, config.RepoConf): + # We still want the old data, so we don't download twice. So we + # pretend everything is good until the revert. + if not self.timestamp_check: +- raise Errors.RepoError, "Can't download or revert repomd.xml" ++ raise Errors.RepoError, "Can't download or revert repomd.xml for %s" % self.ui_id + + if 'old_repo_XML' not in self._oldRepoMDData: + self._oldRepoMDData = {} +@@ -1260,6 +1392,9 @@ class YumRepository(Repository, config.RepoConf): return True def _check_db_version(self, mdtype, repoXML=None): @@ -159728,7 +160250,7 @@ index e5e9ece..fc2614e 100644 if repoXML is None: repoXML = self.repoXML if mdtype in repoXML.repoData: -@@ -1277,11 +1388,11 @@ class YumRepository(Repository, config.RepoConf): +@@ -1277,11 +1412,11 @@ class YumRepository(Repository, config.RepoConf): return None if not file_check: @@ -159743,7 +160265,7 @@ index e5e9ece..fc2614e 100644 if not os.path.exists(local): local = misc.decompress(local, fn_only=True) compressed = True -@@ -1302,6 +1413,17 @@ class YumRepository(Repository, config.RepoConf): +@@ -1302,6 +1437,17 @@ class YumRepository(Repository, config.RepoConf): into the delete list, this means metadata can change filename without us leaking it. """ @@ -159761,7 +160283,7 @@ index e5e9ece..fc2614e 100644 def _mdtype_eq(omdtype, odata, nmdtype, ndata): """ Check if two returns from _get_mdtype_data() are equal. """ if ndata is None: -@@ -1321,6 +1443,14 @@ class YumRepository(Repository, config.RepoConf): +@@ -1321,6 +1467,14 @@ class YumRepository(Repository, config.RepoConf): return True all_mdtypes = self.retrieved.keys() @@ -159776,7 +160298,7 @@ index e5e9ece..fc2614e 100644 if mdtypes is None: mdtypes = all_mdtypes -@@ -1333,8 +1463,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1333,8 +1487,7 @@ class YumRepository(Repository, config.RepoConf): # Inited twice atm. ... sue me self._oldRepoMDData['new_MD_files'] = [] @@ -159786,7 +160308,7 @@ index e5e9ece..fc2614e 100644 for mdtype in all_mdtypes: (nmdtype, ndata) = self._get_mdtype_data(mdtype) -@@ -1371,43 +1500,16 @@ class YumRepository(Repository, config.RepoConf): +@@ -1371,43 +1524,16 @@ class YumRepository(Repository, config.RepoConf): # No old repomd data, but we might still have uncompressed MD if self._groupCheckDataMDValid(ndata, nmdtype, mdtype): continue @@ -159801,14 +160323,14 @@ index e5e9ece..fc2614e 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): @@ -159835,7 +160357,7 @@ index e5e9ece..fc2614e 100644 def _groupLoadRepoXML(self, text=None, mdtypes=None): """ Retrieve the new repomd.xml from the repository, then check it -@@ -1421,7 +1523,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1421,7 +1547,7 @@ class YumRepository(Repository, config.RepoConf): self._commonRetrieveDataMD(mdtypes) def _mdpolicy2mdtypes(self): @@ -159844,7 +160366,7 @@ index e5e9ece..fc2614e 100644 'group:primary' : ['primary'], 'group:small' : ["primary", "updateinfo"], 'group:main' : ["primary", "group", "filelists", -@@ -1436,6 +1538,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1436,6 +1562,7 @@ class YumRepository(Repository, config.RepoConf): if not mdtypes or 'group:all' in mdtypes: mdtypes = None else: @@ -159852,7 +160374,13 @@ index e5e9ece..fc2614e 100644 mdtypes = sorted(list(mdtypes)) return mdtypes -@@ -1451,12 +1554,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1446,17 +1573,12 @@ class YumRepository(Repository, config.RepoConf): + except KeyboardInterrupt: + self._revertOldRepoXML() # Undo metadata cookie? + raise +- raise Errors.RepoError, 'Bad loadRepoXML policy: %s' % (self.mdpolicy) ++ raise Errors.RepoError, 'Bad loadRepoXML policy (for %s): %s' % (self.ui_id, self.mdpolicy) + def _getRepoXML(self): if self._repoXML: return self._repoXML @@ -159862,20 +160390,20 @@ index e5e9ece..fc2614e 100644 - msg = ("Cannot retrieve repository metadata (repomd.xml) for repository: %s. " - "Please verify its path and try again" % self ) - raise Errors.RepoError, msg -+ self._loadRepoXML(text=self) ++ self._loadRepoXML(text=self.ui_id) return self._repoXML -@@ -1480,7 +1578,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1480,7 +1602,7 @@ class YumRepository(Repository, config.RepoConf): result = self._getFile(relative='repodata/repomd.xml.asc', copy_local=1, local = sigfile, - text='%s/signature' % self.id, -+ text='%s/signature' % self, ++ text='%s/signature' % self.ui_id, reget=None, checkfunc=None, cache=self.http_caching == 'all', -@@ -1514,7 +1612,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1514,7 +1636,7 @@ class YumRepository(Repository, config.RepoConf): return self._checkMD(fn, mdtype, openchecksum) def _checkMD(self, fn, mdtype, openchecksum=False, @@ -159884,7 +160412,7 @@ index e5e9ece..fc2614e 100644 """ Internal function, use .checkMD() from outside yum. """ thisdata = data # So the argument name is nicer -@@ -1537,6 +1635,18 @@ class YumRepository(Repository, config.RepoConf): +@@ -1537,6 +1659,18 @@ class YumRepository(Repository, config.RepoConf): if size is not None: size = int(size) @@ -159903,7 +160431,7 @@ index e5e9ece..fc2614e 100644 try: # get the local checksum l_csum = self._checksum(r_ctype, file, datasize=size) except Errors.RepoError, e: -@@ -1551,15 +1661,13 @@ class YumRepository(Repository, config.RepoConf): +@@ -1551,15 +1685,13 @@ class YumRepository(Repository, config.RepoConf): return None raise URLGrabError(-1, 'Metadata file does not match checksum') @@ -159920,7 +160448,28 @@ index e5e9ece..fc2614e 100644 """ Internal function, use .retrieveMD() from outside yum. """ # Note that this can raise Errors.RepoMDError if mdtype doesn't exist # for this repo. -@@ -1597,8 +1705,10 @@ class YumRepository(Repository, config.RepoConf): +@@ -1580,15 +1712,19 @@ class YumRepository(Repository, config.RepoConf): + try: + self.checkMD(local, mdtype) + except URLGrabError, e: ++ if retrieve_can_fail: ++ return None + raise Errors.RepoError, \ + "Caching enabled and local cache: %s does not match checksum" % local + else: + return local + + else: # ain't there - raise ++ if retrieve_can_fail: ++ return None + raise Errors.RepoError, \ + "Caching enabled but no local cache of %s from %s" % (local, +- self) ++ self.ui_id) + + if (os.path.exists(local) or + self._preload_md_from_system_cache(os.path.basename(local))): +@@ -1597,8 +1733,10 @@ class YumRepository(Repository, config.RepoConf): return local # it's the same return the local one try: @@ -159933,7 +160482,7 @@ index e5e9ece..fc2614e 100644 if thisdata.size is None: reget = None else: -@@ -1613,8 +1723,9 @@ class YumRepository(Repository, config.RepoConf): +@@ -1613,8 +1751,9 @@ class YumRepository(Repository, config.RepoConf): checkfunc=checkfunc, text=text, cache=self.http_caching == 'all', @@ -159945,15 +160494,18 @@ index e5e9ece..fc2614e 100644 if retrieve_can_fail: return None raise -@@ -1624,7 +1735,6 @@ class YumRepository(Repository, config.RepoConf): +@@ -1622,9 +1761,8 @@ class YumRepository(Repository, config.RepoConf): + if retrieve_can_fail: + return None raise Errors.RepoError, \ - "Could not retrieve %s matching remote checksum from %s" % (local, self) +- "Could not retrieve %s matching remote checksum from %s" % (local, self) ++ "Could not retrieve %s matching remote checksum from %s" % (local, self.ui_id) else: - self.retrieved[mdtype] = 1 return local -@@ -1646,13 +1756,21 @@ class YumRepository(Repository, config.RepoConf): +@@ -1646,13 +1784,21 @@ class YumRepository(Repository, config.RepoConf): def getGroups(self): """gets groups and returns group file path for the repository, if there @@ -159964,7 +160516,7 @@ index e5e9ece..fc2614e 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 @@ -159978,7 +160530,7 @@ index e5e9ece..fc2614e 100644 self._callbacks_changed = True def setFailureObj(self, failure_obj): -@@ -1681,7 +1799,7 @@ class YumRepository(Repository, config.RepoConf): +@@ -1681,7 +1827,7 @@ class YumRepository(Repository, config.RepoConf): print "Could not read mirrorlist %s, error was \n%s" %(url, e) content = [] for line in content: @@ -159987,8 +160539,26 @@ index e5e9ece..fc2614e 100644 continue mirror = line.rstrip() # no more trailing \n's mirror = mirror.replace('$ARCH', '$BASEARCH') +@@ -1713,7 +1859,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 +2023,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..52c3127 100644 +index 4dcbea7..a2e0b1b 100644 --- a/yumcommands.py +++ b/yumcommands.py @@ -29,7 +29,7 @@ import operator @@ -161680,12 +162250,13 @@ index 4dcbea7..52c3127 100644 + """ def getNames(self): +- return ('repolist',) + """Return a list containing the names of this command. This + command can be called from the command line by using any of these names. + + :return: a list containing the names of this command + """ - return ('repolist',) ++ return ('repolist', 'repoinfo') def getUsage(self): + """Return a usage string for this command. @@ -161718,7 +162289,19 @@ index 4dcbea7..52c3127 100644 def _repo_size(repo): ret = 0 for pkg in repo.sack.returnPackages(): -@@ -866,6 +1902,13 @@ class RepoListCommand(YumCommand): +@@ -857,7 +1893,10 @@ class RepoListCommand(YumCommand): + arg = 'enabled' + extcmds = map(lambda x: x.lower(), extcmds) + +- verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) ++ if basecmd == 'repoinfo': ++ verbose = True ++ else: ++ verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3) + if arg != 'disabled' or extcmds: + try: + # Setup so len(repo.sack) is correct +@@ -866,6 +1905,13 @@ class RepoListCommand(YumCommand): except yum.Errors.RepoError: if verbose: raise @@ -161732,7 +162315,7 @@ index 4dcbea7..52c3127 100644 repos = base.repos.repos.values() repos.sort() -@@ -924,111 +1967,108 @@ class RepoListCommand(YumCommand): +@@ -924,111 +1970,108 @@ class RepoListCommand(YumCommand): ui_enabled = dhibeg + _('disabled') + hiend ui_endis_wid = utf8_width(_('disabled')) @@ -161746,7 +162329,7 @@ index 4dcbea7..52c3127 100644 - cols.append((rid, repo.name, - (ui_enabled, ui_endis_wid), ui_num)) + if not verbose: -+ rid = str(repo) ++ rid = repo.ui_id # can't use str() + if enabled and repo.metalink: + mdts = repo.metalink_data.repomd.timestamp + if mdts > repo.repoXML.timestamp: @@ -161758,7 +162341,7 @@ index 4dcbea7..52c3127 100644 + md = repo.repoXML else: + md = None -+ out = [base.fmtKeyValFill(_("Repo-id : "), repo), ++ out = [base.fmtKeyValFill(_("Repo-id : "), repo.ui_id), + base.fmtKeyValFill(_("Repo-name : "), repo.name)] + + if force_show or extcmds: @@ -161932,12 +162515,12 @@ index 4dcbea7..52c3127 100644 - base.verbose_logger.log(logginglevels.DEBUG_3, - "%s\n", - "\n".join(map(misc.to_unicode, out))) -+ base.verbose_logger.log(logginglevels.DEBUG_3, "%s\n", ++ base.verbose_logger.info("%s\n", + "\n".join(map(misc.to_unicode, out))) if not verbose and cols: # Work out the first (id) and last (enabled/disalbed/count), -@@ -1088,21 +2128,54 @@ class RepoListCommand(YumCommand): +@@ -1088,21 +2131,54 @@ class RepoListCommand(YumCommand): return 0, ['repolist: ' +to_unicode(locale.format("%d", tot_num, True))] def needTs(self, base, basecmd, extcmds): @@ -161992,7 +162575,7 @@ index 4dcbea7..52c3127 100644 if len(extcmds) == 0: base.usage() raise cli.CliError -@@ -1147,28 +2220,85 @@ class HelpCommand(YumCommand): +@@ -1147,28 +2223,85 @@ class HelpCommand(YumCommand): return help_output def doCommand(self, base, basecmd, extcmds): @@ -162078,7 +162661,7 @@ index 4dcbea7..52c3127 100644 self.doneCommand(base, _("Setting up Reinstall Process")) try: return base.reinstallPkgs(extcmds) -@@ -1177,49 +2307,139 @@ class ReInstallCommand(YumCommand): +@@ -1177,49 +2310,139 @@ class ReInstallCommand(YumCommand): return 1, [to_unicode(e)] def getSummary(self): @@ -162219,7 +162802,7 @@ index 4dcbea7..52c3127 100644 vcmd = 'installed' if extcmds: vcmd = extcmds[0] -@@ -1308,7 +2528,7 @@ class VersionCommand(YumCommand): +@@ -1308,7 +2531,7 @@ class VersionCommand(YumCommand): str(data[2][grp]))) _append_repos(cols, data[3][grp]) except yum.Errors.YumBaseError, e: @@ -162228,7 +162811,7 @@ index 4dcbea7..52c3127 100644 if vcmd in ('available', 'all', 'group-available', 'group-all'): try: data = base.pkgSack.simpleVersion(not verbose, groups=groups) -@@ -1327,7 +2547,7 @@ class VersionCommand(YumCommand): +@@ -1327,7 +2550,7 @@ class VersionCommand(YumCommand): if verbose: _append_repos(cols, data[3][grp]) except yum.Errors.YumBaseError, e: @@ -162237,7 +162820,7 @@ index 4dcbea7..52c3127 100644 data = {'rid' : {}, 'ver' : {}} for (rid, ver) in cols: -@@ -1344,6 +2564,14 @@ class VersionCommand(YumCommand): +@@ -1344,6 +2567,14 @@ class VersionCommand(YumCommand): return 0, ['version'] def needTs(self, base, basecmd, extcmds): @@ -162252,7 +162835,7 @@ index 4dcbea7..52c3127 100644 vcmd = 'installed' if extcmds: vcmd = extcmds[0] -@@ -1354,23 +2582,62 @@ class VersionCommand(YumCommand): +@@ -1354,23 +2585,62 @@ class VersionCommand(YumCommand): class HistoryCommand(YumCommand): @@ -162316,7 +162899,7 @@ index 4dcbea7..52c3127 100644 return 2, ["Repeating transaction %u" % (old.tid,)] def _hcmd_undo(self, base, extcmds): -@@ -1426,12 +2693,57 @@ class HistoryCommand(YumCommand): +@@ -1426,12 +2696,57 @@ class HistoryCommand(YumCommand): def _hcmd_new(self, base, extcmds): base.history._create_db_file() @@ -162375,7 +162958,7 @@ index 4dcbea7..52c3127 100644 if extcmds and extcmds[0] not in cmds: base.logger.critical(_('Invalid history sub-command, use: %s.'), ", ".join(cmds)) -@@ -1444,6 +2756,19 @@ class HistoryCommand(YumCommand): +@@ -1444,6 +2759,19 @@ class HistoryCommand(YumCommand): raise cli.CliError def doCommand(self, base, basecmd, extcmds): @@ -162395,7 +162978,7 @@ index 4dcbea7..52c3127 100644 vcmd = 'list' if extcmds: vcmd = extcmds[0] -@@ -1468,12 +2793,26 @@ class HistoryCommand(YumCommand): +@@ -1468,12 +2796,26 @@ class HistoryCommand(YumCommand): ret = self._hcmd_rollback(base, extcmds) elif vcmd == 'new': ret = self._hcmd_new(base, extcmds) @@ -162422,7 +163005,7 @@ index 4dcbea7..52c3127 100644 vcmd = 'list' if extcmds: vcmd = extcmds[0] -@@ -1481,16 +2820,46 @@ class HistoryCommand(YumCommand): +@@ -1481,16 +2823,46 @@ class HistoryCommand(YumCommand): class CheckRpmdbCommand(YumCommand): @@ -162469,7 +163052,7 @@ index 4dcbea7..52c3127 100644 chkcmd = 'all' if extcmds: chkcmd = extcmds -@@ -1505,19 +2874,57 @@ class CheckRpmdbCommand(YumCommand): +@@ -1505,19 +2877,57 @@ class CheckRpmdbCommand(YumCommand): return rc, ['%s %s' % (basecmd, chkcmd)] def needTs(self, base, basecmd, extcmds): @@ -162527,7 +163110,7 @@ index 4dcbea7..52c3127 100644 if not extcmds: base.logger.critical(_("No saved transaction file specified.")) raise cli.CliError -@@ -1533,5 +2940,13 @@ class LoadTransactionCommand(YumCommand): +@@ -1533,5 +2943,13 @@ class LoadTransactionCommand(YumCommand): def needTs(self, base, basecmd, extcmds): diff --git a/yum.spec b/yum.spec index fa49208..01ba845 100644 --- a/yum.spec +++ b/yum.spec @@ -18,7 +18,7 @@ Summary: RPM package installer/updater/manager Name: yum Version: 3.4.3 -Release: 37%{?dist} +Release: 54%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz @@ -32,6 +32,12 @@ Patch7: yum-ppc64-preferred.patch Patch8: BZ-803346-no-only-update.patch Patch20: yum-manpage-files.patch Patch21: yum-completion-helper.patch +Patch22: BZ-881756-include-langpacks.patch +Patch23: BZ-885139-not-enough-arguments.patch +Patch24: BZ-908870-MD-files-bad.patch +Patch25: BZ-870691-repos-with-no-url.patch +Patch26: BZ-927240-fix-package-download-and-verify.patch +Patch27: BZ-920758-keep-installedFileRequires-inc-sync.patch URL: http://yum.baseurl.org/ BuildArchitectures: noarch @@ -56,6 +62,9 @@ Requires: python-sqlite Requires: python-urlgrabber >= 3.9.0-8 Requires: yum-metadata-parser >= 1.1.0 Requires: pygpgme +# rawhide is >= 0.5.3-7.fc18 ... as this is added. +Requires: pyliblzma +Requires: pyxattr Conflicts: rpm >= 5-0 # Zif is a re-implementation of yum in C, however: @@ -91,6 +100,8 @@ Provides: yum-protect-packages = 1.1.27-0.yum Provides: yum-plugin-protect-packages = 1.1.27-0.yum Obsoletes: yum-plugin-download-order <= 0.2-2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: yum-plugin-downloadonly <= 1.1.31-7.fc18 +Provides: yum-plugin-downloadonly = 3.4.3-44.yum %description @@ -120,7 +131,7 @@ can notify you when they are available via email, syslog or dbus. %package cron Summary: Files needed to run yum updates as a cron job Group: System Environment/Base -Requires: yum >= 3.0 vixie-cron crontabs yum-plugin-downloadonly findutils +Requires: yum >= 3.0 cronie crontabs findutils Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -141,6 +152,12 @@ Install this package if you want auto yum updates nightly via cron. %patch8 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 %patch1 -p1 %build @@ -272,6 +289,7 @@ exit 0 %{_sysconfdir}/bash_completion.d %dir %{_datadir}/yum-cli %{_datadir}/yum-cli/* +%exclude %{_datadir}/yum-cli/completion-helper.py? %if %{yum_updatesd} %exclude %{_datadir}/yum-cli/yumupd.py* %endif @@ -315,6 +333,69 @@ exit 0 %endif %changelog +* Thu Apr 4 2013 Zdenek Pavlas - 3.4.3-54 +- Fix a depsolver traceback. BZ 920758 + +* Mon Mar 25 2013 Zdenek Pavlas - 3.4.3-53 +- fix getPackage() calling verifyLocalPkg() too early +- downloadPkgs(): skip duplicated packages, issue warning. + +* Mon Mar 11 2013 Zdenek Pavlas - 3.4.3-52 +- ui_id: prevent TB on invalid repos with no URLs. BZ 870691 + +* Tue Feb 19 2013 James Antill - 3.4.3-51 +- Fix non-removal of corrupt metadata files. BZ 908870. + +* Tue Feb 19 2013 Zdenek Pavlas - 3.4.3-50 +- Revert last commit, bump the obsoleted range. BZ 905438 + +* Wed Feb 6 2013 Zdenek Pavlas - 3.4.3-49 +- Conflict with yum-plugin-downloadonly. BZ 905438 + +* Wed Jan 16 2013 Zdeněk Pavlas - 3.4.3-48 +- Fix a typo in select_groups(). BZ 885139 + +* Thu Dec 6 2012 Zdeněk Pavlas - 3.4.3-47 +- Include langpacks when reading and writing comps. BZ 881756 + +* Tue Oct 23 2012 James Antill - 3.4.3-46 +- update to latest HEAD. +- Minor upstream fixes, mainly for ppc64p7. + +* Tue Oct 2 2012 Zdenek Pavlas - 3.4.3-45 +- update to latest HEAD. +- Don't skip loadts new rpmdbv check, when transaction changes. BZ 857961 +- Set ignorenewrpm to True, not False, to get it to ignore. BZ 858205. +- Actually use verifyLocalPkg(). Helps BZ 858632. +- Display script output when transaction fails. BZ 856969 +- Avoid mkdir repodir/gen/gen in misc.decompress() +- completion helper: Handle ConfigError. BZ 861264. + +* Wed Sep 12 2012 James Antill - 3.4.3-44 +- update to latest HEAD. +- Write out groupid and not optionid, for environment groups. + +* Fri Sep 7 2012 James Antill - 3.4.3-43 +- update to latest HEAD. +- Use .ui_id explicitly for backcompat. on strings, *sigh*. + +* Fri Aug 31 2012 Jesse Keating - 3.4.3-42 +- Fix HEAD patch, add a self. to function call + +* Fri Aug 31 2012 James Antill - 3.4.3-41 +- update to latest HEAD. +- Don't statvfs when we aren't going to copy, and using relative. + +* Thu Aug 30 2012 James Antill - 3.4.3-40 +- update to latest HEAD. +- Fix rel-eng problems when repo.repofile is None. +- Remove statvfs check for local files when we don't copy. + +* Wed Aug 29 2012 Zdenek Pavlas - 3.4.3-38 +- update to latest HEAD. +- fix a race in group_gz download +- send 'private' mirror flags to urlgrabber. + * Wed Aug 29 2012 James Antill - 3.4.3-37 - update to latest HEAD. - Fix problem on metalink downloads due to weird python issue. @@ -326,13 +407,13 @@ exit 0 - Add releasever/arch to repoids on output, if used in urls. - Merge mirror errors fix. -* Thu Aug 23 2012 Zdenek Pavlas - 3.4.3-34 -- Some users skip setupProgressCallbacks(). BZ 850913. +* Mon Aug 27 2012 Zdenek Pavlas - 3.4.3-34 +- update to latest HEAD. +- customized multi_progress_obj option +- improved reporting of mirror group failures * Wed Aug 22 2012 Zdenek Pavlas - 3.4.3-33 -- update to latest HEAD. -- Set multi_progress_obj option -- Show full URLs and mirror errors when _getFile() fails. +- Fix a typo in checkfunc. BZ 850550 * Thu Aug 16 2012 James Antill - 3.4.3-32 - update to latest HEAD.