extras-buildsys/utils/pushscript Utils.py, 1.27, 1.28 MultiLib.py, 1.20, 1.21

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4101

Modified Files:
	Utils.py MultiLib.py 
Log Message:
Use a separate metadata cachedir for each dist/arch/pushtarget as else
we need to copy too much when fixing group-access file permissions.



Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Utils.py	12 Nov 2008 17:19:05 -0000	1.27
+++ Utils.py	8 Feb 2009 16:20:11 -0000	1.28
@@ -322,7 +322,7 @@
                 os.chmod(fullpath,filemode)
         shutil.rmtree(cachedir)
         shutil.move(src=tmpcachedir,dst=cachedir)
-        shutil.rmtree(tmpdir)
+    shutil.rmtree(tmpdir)
 
 
 def get_pkg_header(pkg):


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MultiLib.py	14 Nov 2008 12:53:37 -0000	1.20
+++ MultiLib.py	8 Feb 2009 16:20:11 -0000	1.21
@@ -299,8 +299,9 @@
             repo.disable()
         else:
             repo.enable()
-    my.repos.setCacheDir(cfg.cachedir)
-    Utils.fix_mdcache_access(cfg.rundir,cfg.cachedir)
+    cachedir = '%s-%s-%s-%s' % (cfg.cachedir, cfg.distro, dist, srcarch)
+    my.repos.setCacheDir(cachedir)
+    Utils.fix_mdcache_access(cfg.rundir,cachedir)
     try:
         print 'Reading metadata...'
         my.readMetadata()
@@ -308,10 +309,10 @@
         print 'Yum error: %s' % e
         # TODO: This is only bad if it's something a re-run doesn't fix automatically.
     except:
-        Utils.fix_mdcache_access(cfg.rundir,cfg.cachedir)
+        Utils.fix_mdcache_access(cfg.rundir,cachedir)
         raise
     print 'done.'
-    Utils.fix_mdcache_access(cfg.rundir,cfg.cachedir)
+    Utils.fix_mdcache_access(cfg.rundir,cachedir)
 
     srcrepodir = Utils.rpm_repodir(cfg, testdist, srcarch)
     srcdebugrepodir = Utils.debug_repodir(cfg, testdist, srcarch)