[yum-cvs] yum-utils repoclosure.py,1.2,1.3

[Seth Vidal]

Update of /home/groups/yum/cvs/yum-utils
In directory login:/tmp/cvs-serv19863

Modified Files:
	repoclosure.py 
Log Message:
check in bill nottingham's patch to allow to specify arch and a different
config file for repoclosure



Index: repoclosure.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoclosure.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- repoclosure.py	22 Mar 2005 13:54:33 -0000	1.2
+++ repoclosure.py	3 Jun 2005 07:11:20 -0000	1.3
@@ -25,6 +25,8 @@
 import yum.Errors
 import sys
 import os
+from optparse import OptionParser
+import rpmUtils.arch
 
 flagsdict = {'GT':'>', 'LT':'<', 'EQ': '=', 'GE':'>=', 'LE':'<='}
 
@@ -46,7 +48,15 @@
     
     return val
     
-    
+def parseArgs():
+    usage = "usage: %s [-c <config file>] [-a <arch>] [repoid] [repoid2...]" % sys.argv[0]
+    parser = OptionParser(usage=usage)
+    parser.add_option("-c", default='/etc/yum.conf', dest="config",
+        help='config file to use (defaults to /etc/yum.conf)')
+    parser.add_option("-a", default=None, dest="arch",
+        help='check as if running the specified arch (default: current arch)')
+    (opts, args) = parser.parse_args()
+    return (opts, args)
 
 class YumQuiet(yum.YumBase):
     def __init__(self):
@@ -55,10 +65,10 @@
     def log(self, value, msg):
         pass
 
-def main(repoids=None):
-
+def main(args):
+    (opts, repoids) = parseArgs()
     my = YumQuiet()
-    my.doConfigSetup()
+    my.doConfigSetup(fn = opts.config)
     if hasattr(my.repos, 'sqlite'):
         my.repos.sqlite = False
         my.repos._selectSackType()
@@ -67,7 +77,7 @@
         my.conf.setConfigOption('cache', 1)
         print 'Not running as root, might not be able to import all of cache'
 
-    if repoids is not None:
+    if repoids:
         for repo in my.repos.repos.values():
             if repo.id not in repoids:
                 repo.disable()
@@ -76,7 +86,7 @@
 
     my.doRepoSetup()
     print 'Reading in repository metadata - please wait....'
-    my.doSackSetup()
+    my.doSackSetup(rpmUtils.arch.getArchList(opts.arch))
     for repo in my.repos.listEnabled():
             
         try: