[yum-git] yum/__init__.py

Seth Vidal skvidal at linux.duke.edu
Thu Feb 28 20:23:16 UTC 2008


 yum/__init__.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7ee21ae69dd59bf634eb76f3c9ce103e45305990
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Feb 28 15:23:03 2008 -0500

    when searching provides and the input does not have a glob and looks
    like a file, we can accept as true the results from returnPackagesByDep()
    
    this helps us avoid unnecessarily downloading the filelists when
    they aren't needed

diff --git a/yum/__init__.py b/yum/__init__.py
index 3148a8e..6a8a741 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1568,17 +1568,21 @@ class YumBase(depsolve.Depsolve):
                     _('searching package %s'), po)
                 tmpvalues = []
                 
-                
                 if usedDepString:
                     tmpvalues.append(arg)
 
-                if isglob or canBeFile:
+                if not isglob and canBeFile:
+                    # then it is not a globbed file we have matched it precisely
+                    tmpvalues.append(arg)
+                    
+                if isglob:
                     self.verbose_logger.log(logginglevels.DEBUG_2,
                         _('searching in file entries'))
                     for thisfile in po.dirlist + po.filelist + po.ghostlist:
                         if fnmatch.fnmatch(thisfile, arg):
                             tmpvalues.append(thisfile)
                 
+
                 self.verbose_logger.log(logginglevels.DEBUG_2,
                     _('searching in provides entries'))
                 for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:



More information about the Yum-cvs-commits mailing list