[yum-cvs] yum-utils repoquery.py,1.27,1.28

Panu Matilainen pmatilai at linux.duke.edu
Mon Jan 2 19:23:58 UTC 2006


Update of /home/groups/yum/cvs/yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv5362

Modified Files:
	repoquery.py 
Log Message:
- --all is really just a shorthand for '*'


Index: repoquery.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoquery.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- repoquery.py	20 Dec 2005 17:25:30 -0000	1.27
+++ repoquery.py	2 Jan 2006 19:23:56 -0000	1.28
@@ -329,7 +329,6 @@
         return self.queryPkgFactory(pkgs)
 
     def returnPkgList(self):
-
         pkgs = []
         if self.options.pkgnarrow == "repos":
             if self.conf.showdupesfromrepos:
@@ -367,8 +366,6 @@
         return grps
 
     def matchGroups(self, items):
-        if not items:
-            return self.returnGroups()
         grps = []
         for grp in self.returnGroups():
             for expr in items:
@@ -376,11 +373,7 @@
                     grps.append(grp)
         return grps
                     
-            
     def matchPkgs(self, items):
-        if not items:
-            return self.queryPkgFactory(self.returnPkgList())
-        
         pkgs = []
         notfound = {}
         
@@ -560,9 +553,12 @@
             print tag
         sys.exit(0)
 
-    if len(regexs) < 1 and not opts.all:
-        parser.print_help()
-        sys.exit(1)
+    if len(regexs) < 1:
+        if opts.all:
+            regexs = ['*']
+        else:
+            parser.print_help()
+            sys.exit(1)
 
     pkgops = []
     sackops = []




More information about the Yum-cvs-commits mailing list