extras-buildsys/utils/pushscript MultiLib.py,1.22,1.23

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	MultiLib.py 
Log Message:
Add "opts.usercachedir = True" config value, so each user gets an own
repo metadata cachedir. Where enough diskspace is available, this
makes the expensive fix_mdcache_access() calls unnecessary.




Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MultiLib.py	8 Feb 2009 16:27:33 -0000	1.22
+++ MultiLib.py	8 Feb 2009 21:34:27 -0000	1.23
@@ -299,9 +299,14 @@
             repo.disable()
         else:
             repo.enable()
-    cachedir = '%s-%s-%s-%s' % (cfg.cachedir, cfg.distro, dist, srcarch)
+    usercachedir = hasattr(cfg.opts,'usercachedir') and cfg.opts.usercachedir
+    if usercachedir:
+        cachedir = '%s-uid-%i' % (cfg.cachedir, os.geteuid())
+    else:
+        cachedir = '%s-%s-%s-%s' % (cfg.cachedir, cfg.distro, dist, srcarch)
     my.repos.setCacheDir(cachedir)
-    Utils.fix_mdcache_access(cfg.rundir,cachedir)
+    if not usercachedir:
+        Utils.fix_mdcache_access(cfg.rundir,cachedir)
     try:
         print 'Reading metadata...'
         my.readMetadata()
@@ -309,12 +314,14 @@
         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,cachedir)
+        if not usercachedir:
+            Utils.fix_mdcache_access(cfg.rundir,cachedir)
         raise
     print 'done.'
     # Skip this 2nd run for now.
     # It leaves the mdcache dirs with mode 0755, though.
-#    Utils.fix_mdcache_access(cfg.rundir,cachedir)
+#    if not usercachedir:
+#        Utils.fix_mdcache_access(cfg.rundir,cachedir)
 
     srcrepodir = Utils.rpm_repodir(cfg, testdist, srcarch)
     srcdebugrepodir = Utils.debug_repodir(cfg, testdist, srcarch)