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

[Seth Vidal]

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

Modified Files:
	repoclosure.py 
Log Message:

make repoclosure use -r args for options, instead of just repoids as
argv[1], argv[2] etc.


Index: repoclosure.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoclosure.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- repoclosure.py	3 Jun 2005 07:11:20 -0000	1.3
+++ repoclosure.py	3 Jun 2005 20:45:02 -0000	1.4
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python -t
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,12 +49,15 @@
     return val
     
 def parseArgs():
-    usage = "usage: %s [-c <config file>] [-a <arch>] [repoid] [repoid2...]" % sys.argv[0]
+    usage = "usage: %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0]
     parser = OptionParser(usage=usage)
-    parser.add_option("-c", default='/etc/yum.conf', dest="config",
+    parser.add_option("-c", "--config", default='/etc/yum.conf', dest="config",
         help='config file to use (defaults to /etc/yum.conf)')
-    parser.add_option("-a", default=None, dest="arch",
+    parser.add_option("-a", "--arch", default=None, dest="arch",
         help='check as if running the specified arch (default: current arch)')
+    parser.add_option("-r", "--repoid", default=[], dest="repoids", action='append',
+        help="specify repoids to query, can be specified multiple times (default is all enabled)")
+
     (opts, args) = parser.parse_args()
     return (opts, args)
 
@@ -65,8 +68,8 @@
     def log(self, value, msg):
         pass
 
-def main(args):
-    (opts, repoids) = parseArgs()
+def main():
+    (opts, cruft) = parseArgs()
     my = YumQuiet()
     my.doConfigSetup(fn = opts.config)
     if hasattr(my.repos, 'sqlite'):
@@ -77,9 +80,9 @@
         my.conf.setConfigOption('cache', 1)
         print 'Not running as root, might not be able to import all of cache'
 
-    if repoids:
+    if opts.repoids:
         for repo in my.repos.repos.values():
-            if repo.id not in repoids:
+            if repo.id not in opts.repoids:
                 repo.disable()
             else:
                 repo.enable()
@@ -145,10 +148,5 @@
             print '     %s' % req
     
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        repos = None
-    else:
-        repos = sys.argv[1:]
-    
-    main(repos)
+    main()