Re: [PATCH 4 of 4] hard link packages between local caches

diff -r 09e3be327b9e reposync.py
--- a/reposync.py	Wed May 30 13:26:50 2007 -0400
+++ b/reposync.py	Wed May 30 13:26:53 2007 -0400
@@ -103,6 +103,8 @@ def parseArgs():
         help="Use a temp dir for storing/accessing yum-cache")
     parser.add_option("-d", "--delete", default=False, action="store_true",
         help="delete local packages no longer present in repository")
+    parser.add_option("-k", "--package-cache", default=[], dest='pkgcache', action='append',
+        help="additional directory to search for pre-existing packages")
     parser.add_option("-p", "--download_path", dest='destdir', 
         default=os.getcwd(), help="Path to download packages to: defaults to current dir")
     parser.add_option("-g", "--gpgcheck", default=False, action="store_true",
@@ -135,6 +137,14 @@ def main():
     my = RepoSync(opts=opts)
     my.doConfigSetup(fn=opts.config, init_plugins=False)
 
+    # Populate cache of existing download RPMs from other
+    # repositories we can link to
+    pkgcache = {}
+    for dir in opts.pkgcache:
+        cache = localpkgs(dir)
+        for k in cache.keys():
+            pkgcache[k] = cache[k]
+
     # Force unprivileged users to have a private temporary cachedir
     # if they've not given an explicit cachedir
     if os.getuid() != 0 and not opts.cachedir:
@@ -183,7 +193,18 @@ def main():
             download_list = list(reposack)
 
         local_repo_path = opts.destdir + '/' + repo.id
-        if opts.delete and os.path.exists(local_repo_path):
+        # make sure the repo subdir is here before we go on.
+        if not os.path.exists(local_repo_path):
+            try:
+                os.makedirs(local_repo_path)
+            except IOError, e:
+                my.logger.error("Could not make repo subdir: %s" % e)
+                my.closeRpmDB()
+                sys.exit(1)
+
+        # Check if there's any local files no longer on the remote
+        # repo which need purging
+        if opts.delete:
             current_pkgs = localpkgs(local_repo_path)
 
             download_set = {}
@@ -199,6 +220,7 @@ def main():
                 if not opts.quiet:
                     my.logger.info("Removing obsolete %s", pkg)
                 os.unlink(current_pkgs[pkg]['path'])
+
 
         download_list.sort(sortPkgObj)
         n = 0
@@ -206,47 +228,63 @@ def main():
             n = n + 1
             repo = my.repos.getRepo(pkg.repoid)
             remote = pkg.returnSimple('relativepath')
+            rpmname = os.path.basename(remote)
             local = local_repo_path + '/' + remote
             localdir = os.path.dirname(local)
+            pkg.localpath = local # Hack: to set the localpath we want.
             if not os.path.exists(localdir):
                 os.makedirs(localdir)
 
-            if (os.path.exists(local) and 
+            # If we have a local RPM with same name, and it is
+            # on the same storage device, and it has same size
+            # then we can hardlink it into local dir.
+            if (not os.path.exists(local) and
+                pkgcache.has_key(rpmname) and
+                os.stat(local_repo_path).st_dev == pkgcache[rpmname]['device'] and
+                pkgcache[rpmname]['size'] == int(pkg.returnSimple('packagesize'))):
+
+                if not opts.quiet:
+                    my.logger.info("[%s: %-5d of %-5d ] Linking existing %s" % (repo.id, n, len(download_list), remote))
+                os.link(pkgcache[rpmname]['path'], local)
+
+            # Optionally check gpg signature of local package
+            if os.path.exists(local) and opts.gpgcheck:
+                result, error = my.sigCheckPkg(pkg)
+                if result != 0:
+                    if not opts.quiet:
+                        my.logger.error("[%s: %-5d of %-5d ] Removing non-matching %s" % (repo.id, n, len(download_list), remote))
+                    os.unlink(local)
+
+            # If we have a local pkg with same name, check its size
+            if (os.path.exists(local) and
                 str(os.path.getsize(local)) == pkg.returnSimple('packagesize')):
                 
                 if not opts.quiet:
                     my.logger.error("[%s: %-5d of %-5d ] Skipping existing %s" % (repo.id, n, len(download_list), remote))
                 continue
-    
+
+            # If we're just printing URLs, skip to next repo
             if opts.urls:
                 url = urljoin(repo.urls[0],remote)
                 print '%s' % url
                 continue
     
-            # make sure the repo subdir is here before we go on.
-            if not os.path.exists(local_repo_path):
-                try:
-                    os.makedirs(local_repo_path)
-                except IOError, e:
-                    my.logger.error("Could not make repo subdir: %s" % e)
-                    my.closeRpmDB()
-                    sys.exit(1)
             
             # Disable cache otherwise things won't download            
             repo.cache = 0
             if not opts.quiet:
                 my.logger.info( '[%s: %-5d of %-5d ] Downloading %s' % (repo.id, n, len(download_list), remote))
-            pkg.localpath = local # Hack: to set the localpath we want.
+
             path = repo.getPackage(pkg)
             if opts.gpgcheck:
                 result, error = my.sigCheckPkg(pkg)
                 if result != 0:
                     if result == 1:
-                        my.logger.warning('Removing %s, due to missing GPG key.' % os.path.basename(remote))
+                        my.logger.warning('Removing %s, due to missing GPG key.' % rpmname)
                     elif result == 2:
-                        my.logger.warning('Removing %s due to failed signature check.' % os.path.basename(remote))
+                        my.logger.warning('Removing %s due to failed signature check.' % rpmname)
                     else:
-                        my.logger.warning('Removing %s due to failed signature check: %s' % (os.path.basename(remote), error))
+                        my.logger.warning('Removing %s due to failed signature check: %s' % (rpmname, error))
                     os.unlink(path)
                     continue