extras-repoclosure rc-modified, 1.1, 1.2 repoclosure.patch, 1.1, 1.2 rc-run.py, 1.3, 1.4

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394

Modified Files:
	rc-modified repoclosure.patch rc-run.py 
Log Message:
- add -d/--cachedir option to modified repoclosure



Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rc-modified	30 Apr 2006 11:11:51 -0000	1.1
+++ rc-modified	19 May 2006 22:50:18 -0000	1.2
@@ -43,6 +43,8 @@
         help="specify repo ids to query, can be specified multiple times (default is all enabled)")
     parser.add_option("-t", "--tempcache", default=False, action="store_true", 
         help="Use a temp dir for storing/accessing yum-cache")
+    parser.add_option("-d", "--cachedir", default='', 
+        help="specify a custom directory for storing/accessing yum-cache")
     parser.add_option("-q", "--quiet", default=0, action="store_true", 
                       help="quiet (no output to stderr)")
     parser.add_option("-n", "--newest", default=0, action="store_true",
@@ -147,8 +149,11 @@
             else:
                 repo.enable()
 
-    if os.geteuid() != 0 or opts.tempcache:
-        cachedir = getCacheDir()
+    if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '':
+        if opts.cachedir != '':
+            cachedir = opts.cachedir
+        else:
+            cachedir = getCacheDir()
         if cachedir is None:
             print "Error: Could not make cachedir, exiting"
             sys.exit(50)

repoclosure.patch:

Index: repoclosure.patch
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/repoclosure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- repoclosure.patch	30 Apr 2006 11:11:51 -0000	1.1
+++ repoclosure.patch	19 May 2006 22:50:18 -0000	1.2
@@ -1,8 +1,15 @@
-Against yum-utils-0.5:
-
---- /usr/bin/repoclosure	2006-02-23 18:06:16.000000000 +0100
-+++ rc-modified	2006-04-30 13:02:35.000000000 +0200
-@@ -88,7 +88,10 @@
+--- /usr/bin/repoclosure	2006-05-07 04:20:57.000000000 +0200
++++ rc-modified	2006-05-20 00:43:58.000000000 +0200
+@@ -43,6 +43,8 @@
+         help="specify repo ids to query, can be specified multiple times (default is all enabled)")
+     parser.add_option("-t", "--tempcache", default=False, action="store_true", 
+         help="Use a temp dir for storing/accessing yum-cache")
++    parser.add_option("-d", "--cachedir", default='', 
++        help="specify a custom directory for storing/accessing yum-cache")
+     parser.add_option("-q", "--quiet", default=0, action="store_true", 
+                       help="quiet (no output to stderr)")
+     parser.add_option("-n", "--newest", default=0, action="store_true",
+@@ -88,7 +90,10 @@
          unresolved = {}
          resolved = {}
          if newest:
@@ -14,7 +21,21 @@
          else:
              pkgs = self.pkgSack
  
-@@ -167,7 +170,11 @@
+@@ -144,8 +149,11 @@
+             else:
+                 repo.enable()
+ 
+-    if os.geteuid() != 0 or opts.tempcache:
+-        cachedir = getCacheDir()
++    if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '':
++        if opts.cachedir != '':
++            cachedir = opts.cachedir
++        else:
++            cachedir = getCacheDir()
+         if cachedir is None:
+             print "Error: Could not make cachedir, exiting"
+             sys.exit(50)
+@@ -167,7 +175,11 @@
  
      baddeps = my.getBrokenDeps(opts.newest)
      if opts.newest:
@@ -27,7 +48,7 @@
      else:
          num = len(my.pkgSack)
          
-@@ -182,7 +189,8 @@
+@@ -182,7 +194,8 @@
      pkgs = baddeps.keys()
      pkgs.sort()
      for pkg in pkgs:
@@ -37,7 +58,7 @@
          for (n, f, v) in baddeps[pkg]:
              req = '%s' % n
              if f: 
-@@ -192,6 +200,7 @@
+@@ -192,6 +205,7 @@
                  req = '%s %s' % (req, v)
              
              print '     %s' % req


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rc-run.py	17 May 2006 13:41:11 -0000	1.3
+++ rc-run.py	19 May 2006 22:50:18 -0000	1.4
@@ -8,6 +8,8 @@
 import tempfile
 
 workdir = '/srv/rpmbuild/extras-repoclosure'
+cachedir = '/var/tmp/extras-repoclosure-mdcache'
+#cachedir = '/srv/rpmbuild/extras-repoclosure/mdcache'
 breakfile = 'rc-run.breakfile'
 
 allreleases = [ '3', '4', '5', 'development' ]
@@ -104,7 +106,8 @@
             repoid = '%s-%s-%s' % (r,release,arch)
             rcargs += ('-r %s ' % repoid)
         # -n, --newest : yum-utils 0.5
-        rc = os.system('./rc-modified -q -n -c %s %s >> %s' % (conffile,rcargs,logfilename))
+        # -d : modified version only
+        rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
         checkbreakfile()
         if rc:
             return False