Fix traceback when querying available package's strong requires.

- Also fix "yum check" for strong requires. bug 795907.
- Fix for "Only update available" on downgrade. bug 803346.

0001-Set-_depsolving_failed-as-soon-as-buildTransaction-i.patch

@@ -0,0 +1,13 @@
+--- yum-3.4.3.old/yum/__init__.py	2011-09-26 10:06:24.876279470 +0100
++++ yum-3.4.3/yum/__init__.py	2011-09-26 10:07:35.819800317 +0100
+@@ -966,6 +966,10 @@
+     def buildTransaction(self, unfinished_transactions_check=True):
+         """go through the packages in the transaction set, find them in the
+            packageSack or rpmdb, and pack up the ts accordingly"""
++        # FIXME: This is horrible, see below and yummain. Maybe create a real
++        #        rescode object? :(
++        self._depsolving_failed = False
++
+         if (unfinished_transactions_check and
+             misc.find_unfinished_transactions(yumlibpath=self.conf.persistdir)):
+             msg = _('There are unfinished transactions remaining. You might ' \

BZ-803346-no-only-update.patch

@@ -0,0 +1,113 @@
+From yum-devel-bounces@lists.baseurl.org Thu Mar 15 04:54:11 2012
+Return-Path: yum-devel-bounces@lists.baseurl.org
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail17.collab.prod.int.phx2.redhat.com with LMTP; Thu, 15 Mar 2012
+ 04:54:11 -0400 (EDT)
+Received: from localhost (localhost.localdomain [127.0.0.1]) by
+ zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2504011402A;
+ Thu, 15 Mar 2012 04:54:11 -0400 (EDT)
+X-Quarantine-ID: <I+79tTMZeO4w>
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1]) by
+ localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1])
+ (amavisd-new, port 10024) with ESMTP id I+79tTMZeO4w; Thu, 15 Mar 2012
+ 04:54:11 -0400 (EDT)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com
+ (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by
+ zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E8D74114011;
+ Thu, 15 Mar 2012 04:54:10 -0400 (EDT)
+Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com
+ [10.5.110.16]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8)
+ with ESMTP id q2F8sAi8004183; Thu, 15 Mar 2012 04:54:10 -0400
+Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by
+ mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2F8s8Nd023630; Thu, 15 Mar
+ 2012 04:54:08 -0400
+Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org
+ (Postfix) with ESMTP id AB1CCA0378; Thu, 15 Mar 2012 08:54:08 +0000 (UTC)
+X-Virus-Scanned: amavisd-new at osuosl.org
+Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org
+ [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JtdO5JgtXfRu; Thu, 15
+ Mar 2012 08:54:07 +0000 (UTC)
+Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by
+ hemlock.osuosl.org (Postfix) with ESMTP id C4A10A036E; Thu, 15 Mar 2012
+ 08:54:07 +0000 (UTC)
+X-Original-To: yum-devel@lists.baseurl.org
+Delivered-To: yum-devel@osuosl.org
+Received: from whitealder.osuosl.org (whitealder.osuosl.org
+ [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3DBAC8F75B for
+ <yum-devel@lists.baseurl.org>; Thu, 15 Mar 2012 08:54:06 +0000 (UTC)
+Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org
+ (Postfix) with ESMTP id 0C5028FEF1 for <yum-devel@lists.baseurl.org>; Thu,
+ 15 Mar 2012 08:54:06 +0000 (UTC)
+X-Virus-Scanned: amavisd-new at osuosl.org
+Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost
+ (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id
+ FvpW+oEPmqRK for <yum-devel@lists.baseurl.org>; Thu, 15 Mar 2012 08:54:04
+ +0000 (UTC)
+X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6
+Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
+ whitealder.osuosl.org (Postfix) with ESMTP id 7D0108FBF1 for
+ <yum-devel@lists.baseurl.org>; Thu, 15 Mar 2012 08:54:04 +0000 (UTC)
+Received: from int-mx01.intmail.prod.int.phx2.redhat.com
+ (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com
+ (8.14.4/8.14.4) with ESMTP id q2F8s3XU023619 (version=TLSv1/SSLv3
+ cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for
+ <yum-devel@lists.baseurl.org>; Thu, 15 Mar 2012 04:54:03 -0400
+Received: from koblih.brq.redhat.com (koblih.brq.redhat.com [10.34.24.78])
+ by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id
+ q2F8s2qX018211 for <yum-devel@lists.baseurl.org>; Thu, 15 Mar 2012 04:54:03
+ -0400
+From: =?UTF-8?q?Zden=C4=9Bk=20Pavlas?= <zpavlas@redhat.com>
+To: yum-devel@lists.baseurl.org
+Date: Thu, 15 Mar 2012 09:53:45 +0100
+Message-Id: <1331801625-9070-1-git-send-email-zpavlas@redhat.com>
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
+X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
+Subject: [Yum-devel] [PATCH] No "Only update available" msg when there is
+ not. BZ 803346
+X-BeenThere: yum-devel@lists.baseurl.org
+X-Mailman-Version: 2.1.14
+Precedence: list
+Reply-To: yum development <yum-devel@lists.baseurl.org>
+List-Id: yum development <yum-devel.lists.baseurl.org>
+List-Unsubscribe: <http://lists.baseurl.org/mailman/options/yum-devel>,
+ <mailto:yum-devel-request@lists.baseurl.org?subject=unsubscribe>
+List-Archive: <http://lists.baseurl.org/pipermail/yum-devel>
+List-Post: <mailto:yum-devel@lists.baseurl.org>
+List-Help: <mailto:yum-devel-request@lists.baseurl.org?subject=help>
+List-Subscribe: <http://lists.baseurl.org/mailman/listinfo/yum-devel>,
+ <mailto:yum-devel-request@lists.baseurl.org?subject=subscribe>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Errors-To: yum-devel-bounces@lists.baseurl.org
+Sender: yum-devel-bounces@lists.baseurl.org
+X-RedHat-Spam-Score: -2.3  (RCVD_IN_DNSWL_MED)
+X-Evolution-Source: imap://jantill%40redhat.com@mail.corp.redhat.com/
+Content-Transfer-Encoding: 8bit
+
+---
+ yum/__init__.py |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/yum/__init__.py b/yum/__init__.py
+index 3680356..6f7a69c 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -5075,6 +5075,8 @@ class YumBase(depsolve.Depsolve):
+                 continue
+ 
+             if pkg.verGE(lipkg):
++                if pkg.verEQ(lipkg):
++                    continue
+                 if na not in warned_nas:
+                     msg = _('Only Upgrade available on package: %s') % pkg
+                     self.logger.critical(msg)
+-- 
+1.7.4.4
+
+_______________________________________________
+Yum-devel mailing list
+Yum-devel@lists.baseurl.org
+http://lists.baseurl.org/mailman/listinfo/yum-devel
+

BZ-809469-completion-helper.patch

@@ -0,0 +1,55 @@
+commit 6351d7bbb6957e7c739a674696fcc5d7d31ecb17
+Author: Zdeněk Pavlas <zpavlas@redhat.com>
+Date:   Wed Apr 4 13:36:36 2012 +0200
+
+    completion-helper: skip unavailable repos.  BZ 809469.
+    
+    completion-helper uses --cacheonly option to avoid metadata
+    download, so new (or cleaned up) repos raise exceptions.
+    
+    We work this around by setting skip_if_unavailable=1 on all
+    enabled repositories.
+
+diff --git a/completion-helper.py b/completion-helper.py
+index e4164f7..2e95ced 100755
+--- a/completion-helper.py
++++ b/completion-helper.py
+@@ -74,6 +74,8 @@ def main(args):
+     base.registerCommand(RepoListCompletionCommand())
+     base.getOptionsConfig(args)
+     base.parseCommands()
++    for repo in base.repos.listEnabled():
++        repo.skip_if_unavailable = True
+     base.doCommands()
+ 
+ if __name__ == "__main__":
+commit 6d8a99b413698b117b787fb8d69abeba4fbe7826
+Author: Zdeněk Pavlas <zpavlas@redhat.com>
+Date:   Thu Apr 5 11:08:08 2012 +0200
+
+    completion_helper: catch GroupsError.  BZ 806844.
+
+diff --git a/completion-helper.py b/completion-helper.py
+index 2e95ced..405ceab 100755
+--- a/completion-helper.py
++++ b/completion-helper.py
+@@ -23,6 +23,7 @@ import sys
+ 
+ import cli
+ import yumcommands
++from yum.Errors import GroupsError
+ 
+ 
+ class GroupsCompletionCommand(yumcommands.GroupsCommand):
+@@ -76,7 +77,10 @@ def main(args):
+     base.parseCommands()
+     for repo in base.repos.listEnabled():
+         repo.skip_if_unavailable = True
+-    base.doCommands()
++    try:
++        base.doCommands()
++    except GroupsError, e:
++        base.logger.error(e)
+ 
+ if __name__ == "__main__":
+     try:

handle-strong-requires-of-avail-po.patch

@@ -0,0 +1,27 @@
+commit eb245abe8272da41f484680c5a88518798b15071
+Author: Zdeněk Pavlas <zpavlas@redhat.com>
+Date:   Tue May 15 18:44:19 2012 +0200
+
+    Handle avail_po.returnPrco('strong_requires')
+    
+    Don't traceback when querying available package's strong requires.
+    Return all requires instead.  This is incorrect, but conservative
+    and should work as expected in most use cases.
+    
+    https://fedorahosted.org/autoqa/ticket/421
+
+diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
+index f6df93e..ba929de 100644
+--- a/yum/sqlitesack.py
++++ b/yum/sqlitesack.py
+@@ -382,6 +382,10 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
+ 
+     def returnPrco(self, prcotype, printable=False):
+         prcotype = _share_data(prcotype)
++        if prcotype == 'strong_requires':
++            # pkg not installed so we don't know require flags yet
++            # returning all requires should work in most cases
++            prcotype = 'requires'
+         if isinstance(self.prco[prcotype], tuple):
+             sql = "SELECT name, version, release, epoch, flags " \
+                   "FROM %s WHERE pkgKey = ?" % prcotype

sources

@@ -1 +1,2 @@
 7c8ea8beba5b4e7fe0c215e4ebaa26ed  yum-3.4.3.tar.gz
+0b9555f6ed3e67e247ed092dbceaf1c7  yum-silence.patch

yum-arm-hfp-support.patch

@@ -0,0 +1,54 @@
+diff -uNr yum-3.4.3-orig/rpmUtils/arch.py yum-3.4.3/rpmUtils/arch.py
+--- yum-3.4.3-orig/rpmUtils/arch.py	2011-11-30 19:24:32.000000000 -0600
++++ yum-3.4.3/rpmUtils/arch.py	2011-11-30 19:24:58.000000000 -0600
+@@ -2,6 +2,7 @@
+ #
+ 
+ import os
++import rpm
+ 
+ _ppc64_native_is_best = True
+ 
+@@ -65,6 +66,10 @@
+     "armv5tejl": "armv5tel",
+     "armv5tel": "noarch",
+ 
++    #arm hardware floating point
++    "armv7hnl": "armv7hl",
++    "armv7hl": "noarch",
++
+     # super-h 
+     "sh4a": "sh4",
+     "sh4": "noarch",
+@@ -235,6 +240,13 @@
+ 
+     return arch
+ 
++def getCanonARMArch(arch):
++    # the %{_target_arch} macro in rpm will let us know the abi we are using 
++    target = rpm.expandMacro('%{_target_cpu}')
++    if target.startswith('armv7h'):
++        return target
++    return arch
++
+ def getCanonPPCArch(arch):
+     # FIXME: should I do better handling for mac, etc?
+     if arch != "ppc64":
+@@ -312,6 +324,8 @@
+     if (len(arch) == 4 and arch[0] == "i" and arch[2:4] == "86"):
+         return getCanonX86Arch(arch)
+ 
++    if arch.startswith("arm"):
++        return getCanonARMArch(arch)
+     if arch.startswith("ppc"):
+         return getCanonPPCArch(arch)
+     if arch.startswith("sparc"):
+@@ -363,6 +377,8 @@
+         return "sparc"
+     elif myarch.startswith("ppc64") and not _ppc64_native_is_best:
+         return "ppc"
++    elif myarch.startswith("armv7h"):
++        return "armhfp"
+     elif myarch.startswith("arm"):
+         return "arm"
+         

yum-silence.patch

@@ -0,0 +1,15 @@
+@@ -, +, @@ 
+ 750859.
+ yumcommands.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+--- a/yumcommands.py	
++++ a/yumcommands.py	
+@@ -215,7 +215,7 @@ class YumCommand:
+         :param *args: additional arguments associated with the message
+         """
+         if not self.done_command_once:
+-            base.verbose_logger.info(msg, *args)
++            base.verbose_logger.log(logginglevels.INFO_2, msg, *args)
+         self.done_command_once = True
+ 
+     def getNames(self):

yum.spec

@@ -18,7 +18,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
-Release: 22%{?dist}
+Release: 25%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -29,7 +29,11 @@ Patch4: no-more-exactarchlist.patch
 Patch5: geode-arch.patch
 Patch6: yum-HEAD.patch
 Patch7: yum-ppc64-preferred.patch
+Patch8: BZ-803346-no-only-update.patch
 Patch20: yum-manpage-files.patch
+Patch21: 0001-Set-_depsolving_failed-as-soon-as-buildTransaction-i.patch
+Patch22: BZ-809469-completion-helper.patch
+Patch23: handle-strong-requires-of-avail-po.patch
 
 URL: http://yum.baseurl.org/
 BuildArchitectures: noarch
@@ -136,7 +140,10 @@ Install this package if you want auto yum updates nightly via cron.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %patch20 -p1
+%patch22 -p1
+%patch23 -p1
 %patch1 -p1
 
 %build
@@ -311,92 +318,25 @@ exit 0
 %endif
 
 %changelog
-* Fri Mar  9 2012 James Antill <james at fedoraproject.org> - 3.4.3-22
+* Wed Aug  1 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-25
+- Don't traceback when querying available package's strong requires.
+
+* Thu Apr 26 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-24
+- backported completion-helper.py patches from HEAD, BZ 809469.
+
+* Fri Mar 16 2012 James Antill <james at fedoraproject.org> - 3.4.3-23
 - update to latest HEAD.
-- Fail on bad reinstall/downgrade arguments. bug 800285.
+- Also fix "yum check" for strong requires. bug 795907.
+- Fix for "Only update available" on downgrade. bug 803346.
+
+* Mon Mar 12 2012 James Antill <james at fedoraproject.org> - 3.4.3-22
+- Sync with F17/rawhide.
+- Fixes translations.
 - Fix weird multiple obsoletion bug. BZ 800016
-- Check for a compat. arch. as well, when hand testing for upgradability.
-- Allow changing the exit code on non-fatal errors.
+- Lots of other smaller fixes/changes.
 
-* Thu Mar  1 2012 James Antill <james at fedoraproject.org> - 3.4.3-21
-- update to latest HEAD.
-- Translation update.
-
-* Wed Feb 29 2012 James Antill <james at fedoraproject.org> - 3.4.3-20
-- update to latest HEAD.
-- Lazy setup pkgSack, for localinstall/etc.
-- add support for 64 bit arm hardware.
-- Hack for "info install blah" to never look at repos.
-- Fixup resolvedep command for mock users.
-
-* Mon Feb 20 2012 James Antill <james at fedoraproject.org> - 3.4.3-19
-- update to latest HEAD.
-- Add a yum group convert command, so people can use groups as objects easily.
-- Document the new group stuff.
-- Generic provide markers for installonlypkgs (for kernel/vms).
-- Minor updates/fixes merge some older branches.
-
-* Fri Jan 20 2012 James Antill <james at fedoraproject.org> - 3.4.3-18
-- update to latest HEAD
-- Added group_command, but didn't change to groups as objects by default.
-- Minor updates.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.3-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 13 2011 James Antill <james at fedoraproject.org> - 3.4.3-16
-- update to latest HEAD
-- Have users always use their own dirs.
-- Minor updates.
-
-* Fri Dec  2 2011 James Antill <james at fedoraproject.org> - 3.4.3-15
-- update to latest HEAD
-- Init "found" variable for distro-sync full. BZ 752407.
-- Fix _conv_pkg_state when calling with history as checksum. BZ 757736.
-- When a repo. fails in repolist, manually populate the ones after it.A
-- Fix a corner case in exception2msg(). BZ 749239.
-- Transifex sync.
-- Hand fix the plural forms gettext stuff.
-
-* Wed Nov 30 2011 Dennis Gilmore <dennis@ausil.us> - 3.4.3-13
-- add patch from upstream for arm hardware floating point support
-
-* Mon Oct 17 2011 James Antill <james at fedoraproject.org> - 3.4.3-12
-- update to latest HEAD
-- Basically just an update for transifex sync.
-
-* Fri Oct 14 2011 James Antill <james at fedoraproject.org> - 3.4.3-11
-- update to latest HEAD
-- Some edge case depsolver bug fixes.
-- Output the GPG fingerprint when showing the GPG key.
-- Update bugtracker URL back to redhat.
-- Allow reinstall and remove arguments to history redo command.
-- Let resolvedep look for installed packages.
-
-* Tue Sep 21 2011 James Antill <james at fedoraproject.org> - 3.4.3-10
-- update to latest HEAD
-- Fix for history sync, and saving on install.
-- Lots of minor bug fixes.
-- Speedups for upgrade_requirements_on_install=true.
-- Fix generated data using bad caches.
-- Changes for yum-cron.
-
-* Tue Aug 23 2011 James Antill <james at fedoraproject.org> - 3.4.3-9
-- update to latest HEAD
-- Update translations.
-- Minor UI tweaks for transaction output.
-- Minor tweak for update_reqs_on_install.
-
-* Mon Aug 22 2011 James Antill <james at fedoraproject.org> - 3.4.3-8
-- update to latest HEAD
-- Fix upgrade_requirements_on_install breaking upgrade typos.
-
-* Fri Aug 19 2011 James Antill <james at fedoraproject.org> - 3.4.3-7
-- update to latest HEAD
-- Fix syncing of yum DB data in history.
-- Add upgrade_requirements_on_install config. option.
-- Don't look for releasever if it's set directly (anaconda).
-- Expose ip_resolve urlgrabber option.
+* Fri Dec 09 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 3.4.3-7
+- change loglevel from INFO to INFO_2, bz#750859
 
 * Fri Aug  5 2011 James Antill <james at fedoraproject.org> - 3.4.3-6
 - update to latest HEAD