rpms/yum-utils/devel yum-downloader-archlist.patch, 1.3, 1.4 yum-utils.spec, 1.32, 1.33

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28454

Modified Files:
	yum-downloader-archlist.patch yum-utils.spec 
Log Message:
it works this time, we swear



yum-downloader-archlist.patch:

Index: yum-downloader-archlist.patch
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-downloader-archlist.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yum-downloader-archlist.patch	7 Mar 2008 04:13:53 -0000	1.3
+++ yum-downloader-archlist.patch	7 Mar 2008 16:20:21 -0000	1.4
@@ -1,6 +1,14 @@
---- a/yumdownloader.py	2008-03-06 22:48:24.000000000 -0500
-+++ b/yumdownloader.py	2008-03-06 14:34:12.000000000 -0500
-@@ -64,9 +64,12 @@
+--- a/yumdownloader.py	2008-01-30 01:03:15.000000000 -0500
++++ b/yumdownloader.py	2008-03-07 10:54:06.000000000 -0500
+@@ -26,6 +26,7 @@
+ from urlgrabber.progress import TextMeter
+ import shutil
+ 
++import rpmUtils
+ 
+ class YumDownloader(YumUtilBase):
+     NAME = 'yumdownloader'
+@@ -64,9 +65,12 @@
                  self.logger.error("Error: Could not make cachedir, exiting")
                  sys.exit(50)
              self.repos.setCacheDir(cachedir)
@@ -15,7 +23,7 @@
          # Setup yum (Ts, RPM db, Repo & Sack)
          self.doUtilYumSetup(opts)
          # Setup source repos
-@@ -116,14 +119,12 @@
+@@ -116,14 +120,12 @@
          
      def downloadPackages(self,opts):
          
@@ -31,7 +39,7 @@
              installable = yum.misc.unique(exactmatch + matched)
              if len(unmatched) > 0: # if we get back anything in unmatched, it fails
                  self.logger.error('No Match for argument %s' % pkg)
-@@ -158,9 +159,12 @@ class YumDownloader(YumUtilBase):
+@@ -158,9 +160,12 @@
              if toActOn:
                  if opts.source:
                      toDownload.extend(self.bestPackagesFromList(toActOn, 'src'))
@@ -45,7 +53,7 @@
          # If the user supplies to --resolve flag, resolve dependencies for
          # all packages
          # note this might require root access because the headers need to be
-@@ -215,18 +216,18 @@
+@@ -215,18 +220,20 @@
                                     size=os.stat(path).st_size)
                      shutil.copy2(path, local)
                      progress.end(progress.size) 
@@ -63,11 +71,13 @@
              if opts.source:
                  archlist = rpmUtils.arch.getArchList() + ['src']    
 +            elif opts.archlist:
-+                archlist = opts.archlist.split(',')                
++                archlist = []
++                for a in opts.archlist.split(','):
++                    archlist.extend(rpmUtils.arch.getArchList(a))
              else:
                  archlist = rpmUtils.arch.getArchList()
              self._getSacks(archlist=archlist)
-@@ -251,7 +252,8 @@
+@@ -251,7 +258,8 @@
            help='resolve dependencies and download required packages')
          parser.add_option("--source", default=False, dest="source", action="store_true",
            help='operate on source packages')


Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- yum-utils.spec	7 Mar 2008 04:13:53 -0000	1.32
+++ yum-utils.spec	7 Mar 2008 16:20:21 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
@@ -402,6 +402,9 @@
 
 
 %changelog
+* Fri Mar  7 2008 Seth Vidal <skvidal at fedoraproject.org>
+- once more, with feeling
+
 * Thu Mar 06 2008 Jesse Keating <jkeating at redhat.com> - 1.1.11-4
 - Update yumdownloader to git HEAD for complete archlist support.