[yum: 1/2] update to latest HEAD Fix upgrade_requirements_on_install breaking upgrade typos.

[James Antill]

commit ba7a3bf4ba96225707172ab83dde771ad95a824b
Merge: b8b2a22 4e23d43
Author: James Antill <james at and.org>
Date:   Fri Aug 19 16:47:11 2011 -0400

    update to latest HEAD
    Fix upgrade_requirements_on_install breaking upgrade typos.

 yum-HEAD.patch |    8 +++++---
 yum.spec       |    6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc yum-HEAD.patch
index 588bb37,74ff6ed..466324e
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@@ -60,7 -60,7 +60,7 @@@ index 2f6154e..2e5a052 10064
  diff --git a/cli.py b/cli.py
  old mode 100644
  new mode 100755
- index 6056d38..3a68616
 -index 6056d38..43c0e1d
++index 6056d38..9f2c282
  --- a/cli.py
  +++ b/cli.py
  @@ -25,7 +25,7 @@ import sys
@@@ -465,36 -343,7 +465,38 @@@
           # 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,20 +858,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
 -@@ -770,9 +828,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -745,21 +858,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
 + 
 +         else:
 +             # go through the userlist - look for items that are local rpms. If we find them
 +-            # pass them off to localInstall() and then move on
 ++            # pass them off to installLocal() and then move on
 +             localupdates = []
 +             for item in userlist:
 +                 if (item.endswith('.rpm') and (yum.misc.re_remote_url(item) or
 +                                                os.path.exists(item))):
 +-                    localupdates.append(item)
 +-            
 +-            if len(localupdates) > 0:
 +-                self.localInstall(filelist=localupdates, updateonly=1)
 +-                for item in localupdates:
 +-                    userlist.remove(item)
 +-                
 +-            for arg in userlist:
 +-                if not self.update(pattern=arg, update_to=update_to):
++-                    self._checkMaybeYouMeant(arg)
 ++                    txmbrs = self.installLocal(item, updateonly=1)
 ++                    self._install_upgraded_requires(txmbrs)
 ++                    continue
 ++
 ++                txmbrs = self.update(pattern=item, update_to=update_to)
 ++                self._install_upgraded_requires(txmbrs)
 ++                if not txmbrs:
-                      self._checkMaybeYouMeant(arg)
+++                    self._checkMaybeYouMeant(item)
 + 
 +         if len(self.tsInfo) > oldcount:
++             change = len(self.tsInfo) - oldcount
 +@@ -770,9 +881,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):
diff --cc yum.spec
index f7bc652,8016d22..19a6758
--- a/yum.spec
+++ b/yum.spec
@@@ -18,7 -18,7 +18,7 @@@
  Summary: RPM package installer/updater/manager
  Name: yum
  Version: 3.4.3
- Release: 7%{?dist}
 -Release: 6%{?dist}
++Release: 8%{?dist}
  License: GPLv2+
  Group: System Environment/Base
  Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@@ -316,13 -316,6 +316,17 @@@ exit 
  %endif
  
  %changelog
++* 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 Aug  5 2011 James Antill <james at fedoraproject.org> - 3.4.3-6
  - update to latest HEAD
  - Add new yum DB data.