[yum-utils/f18] fix the --resolve option (again). BZ 908986

Zdeněk Pavlas zpavlas at fedoraproject.org
Mon Feb 18 14:34:09 UTC 2013


commit 3e04e8b14ddb4bbaea675bcf5c6aa4b6006e6f8c
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Feb 18 15:34:00 2013 +0100

    fix the --resolve option (again).  BZ 908986

 yum-utils-HEAD.patch |    8 +++++---
 yum-utils.spec       |    6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/yum-utils-HEAD.patch b/yum-utils-HEAD.patch
index abb103f..ce921f9 100644
--- a/yum-utils-HEAD.patch
+++ b/yum-utils-HEAD.patch
@@ -3047,7 +3047,7 @@ index 8a4888e..4e549cd 100755
          args.pop(0)
          if args:
 diff --git a/yumdownloader.py b/yumdownloader.py
-index e6107d4..300e530 100755
+index e6107d4..990ab85 100755
 --- a/yumdownloader.py
 +++ b/yumdownloader.py
 @@ -7,11 +7,11 @@
@@ -3139,11 +3139,13 @@ index e6107d4..300e530 100755
          
      def downloadPackages(self,opts):
          
-@@ -212,56 +188,34 @@ class YumDownloader(YumUtilBase):
+@@ -211,57 +187,35 @@ class YumDownloader(YumUtilBase):
+             self.resolveDeps()
              # Add newly added packages to the toDownload list
              for pkg in self.tsInfo.getMembers():
-                 if not pkg in toDownload:
+-                if not pkg in toDownload:
 -                    toDownload.append(pkg)
++                if pkg.ts_state in ('i', 'u') and pkg.po not in toDownload:
 +                    toDownload.append(pkg.po)
          if len(toDownload) == 0:
              self.logger.error('Nothing to download')
diff --git a/yum-utils.spec b/yum-utils.spec
index 021d6e5..9197657 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -10,7 +10,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.31
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
@@ -679,6 +679,10 @@ fi
 %{pluginhome}/puppetverify.*
 
 %changelog
+* Mon Feb 18 2013 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-10
+- Update to latest HEAD
+- fix the --resolve option (again).  BZ 908986
+
 * Fri Feb  8 2013 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-9
 - Update to latest HEAD
 - fix the --resolve option.  BZ 908986


More information about the scm-commits mailing list