[yum-cvs] yum cli.py,1.158,1.159

Seth Vidal skvidal at login.linux.duke.edu
Wed Mar 2 06:36:22 UTC 2005


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

Modified Files:
	cli.py 
Log Message:

remove duplicate call in install function


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- cli.py	2 Mar 2005 06:19:59 -0000	1.158
+++ cli.py	2 Mar 2005 06:36:20 -0000	1.159
@@ -872,19 +872,11 @@
                 continue # it was something on disk and it ended in rpm 
                          # no matter what we don't go looking at repos
 
-            if arg[0] == '/':
-                try:
-                    mypkg = self.returnPackageByDep(arg)
-                except yum.Errors.YumBaseError, e:
-                    pass
-                else:
-                    arg = '%s:%s-%s-%s.%s' % (mypkg.epoch, mypkg.name, mypkg.version,
-                                              mypkg.release, mypkg.arch)
-
             arglist = [arg]
             exactmatch, matched, unmatched = parsePackages(avail, arglist)
             if len(unmatched) > 0: # if we get back anything in unmatched, check it for a virtual-provide
                 arg = unmatched[0] #only one in there
+                self.log(3, 'Checking for virtual provide or file-provide for %s' % arg)
                 try:
                     mypkg = self.returnPackageByDep(arg)
                 except yum.Errors.YumBaseError, e:




More information about the Yum-cvs-commits mailing list