[yum-commits] 2 commits - yumdownloader.py

[James Antill]

 yumdownloader.py |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 76a101fd9df2bda66ab40d649649129564ffaa7a
Author: James Antill <james at and.org>
Date:   Tue Apr 26 11:35:17 2011 -0400

    Allow files/provides to be used in yumdownloader.

diff --git a/yumdownloader.py b/yumdownloader.py
index a22b81e..b5fb38a 100755
--- a/yumdownloader.py
+++ b/yumdownloader.py
@@ -172,6 +172,14 @@ class YumDownloader(YumUtilBase):
             pos = self.pkgSack.returnPackages(patterns=pkgnames)
             exactmatch, matched, unmatched = parsePackages(pos, pkgnames)
             installable = yum.misc.unique(exactmatch + matched)
+            if not installable:
+                try:
+                    installable = self.returnPackagesByDep(pkg)
+                    installable = yum.misc.unique(installable)
+                except yum.Errors.YumBaseError, msg:
+                    self.logger.error(str(msg))
+                    continue
+
             if not installable: # doing one at a time, apart from groups
                 self.logger.error('No Match for argument %s' % pkg)
                 continue
commit ecb3986c6223315d802cd6b5c25b24ab669a3772
Author: James Antill <james at and.org>
Date:   Tue Apr 26 11:23:53 2011 -0400

    Exit with code 2, if we can't download the packages asked for. BZ 699469.

diff --git a/yumdownloader.py b/yumdownloader.py
index 6af3682..a22b81e 100755
--- a/yumdownloader.py
+++ b/yumdownloader.py
@@ -96,7 +96,7 @@ class YumDownloader(YumUtilBase):
         if opts.source:
             self.setupSourceRepos()
         # Do the real action
-        self.downloadPackages(opts)
+        self.exit_code = self.downloadPackages(opts)
         
     def setupSourceRepos(self):
         # enable the -source repos for enabled primary repos
@@ -208,7 +208,8 @@ class YumDownloader(YumUtilBase):
         if len(toDownload) == 0:
             self.logger.error('Nothing to download')
             sys.exit(1)
-            
+
+        exit_code = 0
         for pkg in toDownload:
             n,a,e,v,r = pkg.pkgtup
             packages =  self.pkgSack.searchNevra(n,e,v,r,a)
@@ -235,9 +236,11 @@ class YumDownloader(YumUtilBase):
                     path = repo.getPackage(download, checkfunc=checkfunc)
                 except IOError, e:
                     self.logger.error("Cannot write to file %s. Error was: %s" % (local, e))
+                    exit_code = 2
                     continue
                 except RepoError, e:
                     self.logger.error("Could not download/verify pkg %s: %s" % (download, e))
+                    exit_code = 2
                     continue
     
                 if not os.path.exists(local) or not os.path.samefile(path, local):
@@ -245,7 +248,8 @@ class YumDownloader(YumUtilBase):
                     progress.start(basename=os.path.basename(local),
                                    size=os.stat(path).st_size)
                     shutil.copy2(path, local)
-                    progress.end(progress.size) 
+                    progress.end(progress.size)
+        return exit_code
                     
     def _groupPackages(self,pkglist):
         pkgGroups = {}
@@ -304,5 +308,4 @@ class YumDownloader(YumUtilBase):
 if __name__ == '__main__':
     setup_locale()
     util = YumDownloader()
-        
-        
+    sys.exit(util.exit_code)