[yum-cvs] yum cli.py,1.237,1.238 output.py,1.71,1.72

Seth Vidal skvidal at linux.duke.edu
Fri Sep 8 13:32:54 UTC 2006


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

Modified Files:
	cli.py output.py 
Log Message:

- fix up findDeps interface - it now takes a list of package objects
- clean up a deprecation in deplistoutput
- remove RpmBase._prcoTuple2Printable() since it was no longer needed and
only introduced in this devel series.


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- cli.py	6 Sep 2006 12:57:55 -0000	1.237
+++ cli.py	8 Sep 2006 13:32:51 -0000	1.238
@@ -1134,16 +1134,25 @@
         return 0, []
 
     def deplist(self, args=None):
-       """cli wrapper method for findDeps method takes a list of packages and 
-       returns a formatted deplist for that package"""
-
-       if not args:
-          args = self.extcmds
-
-       results = self.findDeps(args)
-       self.depListOutput(results)
+        """cli wrapper method for findDeps method takes a list of packages and 
+            returns a formatted deplist for that package"""
+        
+        if not args:
+            args = self.extcmds
+        
+        self.doRepoSetup()
+        
+        
+        for arg in args:
+            pkgs = []
+            pogen = self.pkgSack.matchPackageNames(arg)
+            for po in pogen:
+                pkgs.append(po)
+                
+            results = self.findDeps(pkgs)
+            self.depListOutput(results)
 
-       return 0, []
+        return 0, []
 
     def provides(self, args=None):
         """use the provides methods in the rpmdb and pkgsack to produce a list 

Index: output.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/output.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- output.py	3 Sep 2006 21:34:56 -0000	1.71
+++ output.py	8 Sep 2006 13:32:51 -0000	1.72
@@ -26,7 +26,7 @@
 
 from urlgrabber.progress import TextMeter
 from urlgrabber.grabber import URLGrabError
-from yum.misc import sortPkgObj
+from yum.misc import sortPkgObj, prco_tuple_to_string
 
 try:
     import readline
@@ -166,7 +166,7 @@
 
             for req in results[pkg].keys():
                 reqlist = results[pkg][req] 
-                print "  dependency: %s" % pkg.prcoPrintable(req)
+                print "  dependency: %s" % prco_tuple_to_string(req)
                 if not reqlist:
                     print "   Unsatisfied dependency"
                     continue




More information about the Yum-cvs-commits mailing list