[yum-commits] Branch 'yum-3_2_X' - 2 commits - docs/yum.conf.5 yum/depsolve.py yum/__init__.py

[James Antill]

 docs/yum.conf.5 |    3 +++
 yum/__init__.py |    1 +
 yum/depsolve.py |    9 +--------
 3 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit b8643ea6865362654014c78308181a149dc4da3f
Author: James Antill <james at and.org>
Date:   Mon Sep 21 16:55:45 2009 -0400

    Fix install "*bin/virt-install" to do what "/*bin/virt-install" does

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 467f657..89adfda 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -159,13 +159,6 @@ class Depsolve(object):
 
         self.verbose_logger.log(logginglevels.DEBUG_1, _('Searching pkgSack for dep: %s'),
             name)
-        # we need to check the name - if it doesn't match:
-        # /etc/* bin/* or /usr/lib/sendmail then we should fetch the 
-        # filelists.xml for all repos to make the searchProvides more complete.
-        if name[0] == '/':
-            if not misc.re_primary_filename(name):
-                self.doSackFilelistPopulate()
-            
         pkgs = self.pkgSack.searchProvides(name)
         
         
@@ -181,7 +174,7 @@ class Depsolve(object):
         for po in pkgs:
             self.verbose_logger.log(logginglevels.DEBUG_2,
                 _('Potential match for %s from %s'), name, po)
-            if name[0] == '/' and r_v is None:
+            if (name[0] == '/' or misc.re_glob(name[0])) and r_v is None:
                 # file dep add all matches to the defSack
                 defSack.addPackage(po)
                 continue
commit 70716339faf2285337f42b0c5f9b07769e7d2304
Author: James Antill <james at and.org>
Date:   Mon Sep 21 16:29:18 2009 -0400

    Add documentation about installonly yumdb attr.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 6295b1e..8976b0c 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -128,6 +128,9 @@ Number of packages listed in installonlypkgs to keep installed at the same
 time. Setting to 0 disables this feature. Default is '0'. Note that this
 functionality used to be in the "installonlyn" plugin, where this option was
 altered via. tokeep.
+Note that as of version 3.2.24, yum will now look in the yumdb for a installonly
+attribute on installed packages. If that attribute is "keep", then they will
+never be removed.
 
 .IP
 \fBkernelpkgnames \fR
diff --git a/yum/__init__.py b/yum/__init__.py
index c1e2c3b..90cdf8d 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3865,6 +3865,7 @@ class YumBase(depsolve.Depsolve):
 
                 if True: # Don't to magic sorting, yet
                     ret_mid.append(pkg)
+                    continue
 
                 if pkg.yumdb_info.installonly == 'remove-first':
                     ret_beg.append(pkg)