[yum] Update to latest HEAD.

[James Antill]

commit f0c38d891fbe72157438aa2fc925d01e979cc82a
Author: James Antill <james at and.org>
Date:   Mon Aug 26 00:17:55 2013 -0400

    Update to latest HEAD.
    
    - Pass requirement to compare_proviers so we can use provides version compare.
    - Show conf. file in yum-cron error message.
    - Add mark convert messages.
    - Fix logging level regression, -d9 works again.
    - Override users umask for groups files, so users can read it. BZ 982361.
    - Fix downgrade keeping .reason, note that remove+install doesn't. BZ 961938.
    - Inherit reason from install package into txmbr. BZ BZ 961938.

 commit-build.sh |    2 +-
 yum-HEAD.patch  |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/commit-build.sh b/commit-build.sh
index 7094099..ca35b21 100755
--- a/commit-build.sh
+++ b/commit-build.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh -ve
 
 fedpkg clog
 git commit -a -F clog
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index d16f0cb..d27c35a 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -192567,7 +192567,7 @@ index d09511f..cd3ef2e 100644
  
          if name not in cfgOptions and option.default == value:
 diff --git a/yum/depsolve.py b/yum/depsolve.py
-index 6d744c0..4d16ef2 100644
+index 6d744c0..dcfd05a 100644
 --- a/yum/depsolve.py
 +++ b/yum/depsolve.py
 @@ -31,13 +31,15 @@ from transactioninfo import TransactionMember
@@ -193094,7 +193094,7 @@ index 6d744c0..4d16ef2 100644
          #  Actual start of _compare_providers().
  
          # Do a NameArch filtering, based on repo. __cmp__
-@@ -1332,6 +1582,26 @@ class Depsolve(object):
+@@ -1332,6 +1582,29 @@ class Depsolve(object):
                          _('common prefix of %s between %s and %s' % (cpl, po, reqpo)))
                  
                      pkgresults[po] += cpl*2
@@ -193114,14 +193114,17 @@ index 6d744c0..4d16ef2 100644
 +                self.verbose_logger.log(logginglevels.DEBUG_4,
 +                                        _('provides vercmp: %s') % str(req))
 +                newest = sorted(prov_depsolve,
-+                                key = lambda x: PackageEVR(*prov_depsolve[x]))[-1]
-+                self.verbose_logger.log(logginglevels.DEBUG_4,
-+                                        _(' Winner: %s') % newest)
-+                pkgresults[newest] += 1
++                                key = lambda x: PackageEVR(*prov_depsolve[x]))
++                for winner in reversed(newest):
++                    if prov_depsolve[winner] != prov_depsolve[newest[-1]]:
++                        break
++                    self.verbose_logger.log(logginglevels.DEBUG_4,
++                                            _(' Winner: %s') % winner)
++                    pkgresults[winner] += 1
                  
          #  If we have more than one "best", see what would happen if we picked
          # each package ... ie. what things do they require that _aren't_ already
-@@ -1393,42 +1663,52 @@ class Depsolve(object):
+@@ -1393,42 +1666,52 @@ class Depsolve(object):
  
  
  class DepCheck(object):