[yum-commits] Branch 'yum-3_2_X' - 3 commits - yum/__init__.py

[skvidal at osuosl.org]

 yum/__init__.py |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 75851e03bb4a959390dc9c7e56ce2b8d531010d6
Merge: 0e5e89c... 46c0a86...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jun 15 14:51:37 2010 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      l10n: Added British English translation
      l10n: Updated Czech (cs) translation to 100%
      l10n: Initial Ukrainian translation
      Fix 0 vs None Epoch handling in compareEVR().
      Deal with putting non-en rpmdb problems in the history DB
      Add name to FakeRepo
      Add protected.d and vars to the yum.conf man page FILES section
      Fix the tsflags documentation
      Only do installed_by and changed_by if we are dealing with installed pkgs.

commit 0e5e89c155be58ad5163f48dbf4bf05d3cc30336
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jun 15 13:48:03 2010 -0400

    add 'if self.conf.obsoletes' to the installed-pkg obsoletes check for localinstall

diff --git a/yum/__init__.py b/yum/__init__.py
index 2db03ae..5bc97be 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3698,10 +3698,11 @@ class YumBase(depsolve.Depsolve):
             self.logger.critical(_('Cannot add package %s to transaction. Not a compatible architecture: %s'), pkg, po.arch)
             return tx_return
         
-        obsoleters = po.obsoletedBy(self.rpmdb.searchObsoletes(po.name))
-        if obsoleters:
-            self.logger.critical(_('Cannot install package %s. It is obsoleted by installed package %s'), po, obsoleters[0])
-            return tx_return
+        if self.conf.obsoletes:
+            obsoleters = po.obsoletedBy(self.rpmdb.searchObsoletes(po.name))
+            if obsoleters:
+                self.logger.critical(_('Cannot install package %s. It is obsoleted by installed package %s'), po, obsoleters[0])
+                return tx_return
             
         # everything installed that matches the name
         installedByKey = self.rpmdb.searchNevra(name=po.name)
commit 91b735bce6aeb1f0fbcc051cbca70ee65a983f63
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jun 15 13:33:07 2010 -0400

    when doing a localinstall check to see if the pkg we want to install is obsoleted by something already installed
    not just those things in the repos.

diff --git a/yum/__init__.py b/yum/__init__.py
index 1d7637f..2db03ae 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3698,6 +3698,11 @@ class YumBase(depsolve.Depsolve):
             self.logger.critical(_('Cannot add package %s to transaction. Not a compatible architecture: %s'), pkg, po.arch)
             return tx_return
         
+        obsoleters = po.obsoletedBy(self.rpmdb.searchObsoletes(po.name))
+        if obsoleters:
+            self.logger.critical(_('Cannot install package %s. It is obsoleted by installed package %s'), po, obsoleters[0])
+            return tx_return
+            
         # everything installed that matches the name
         installedByKey = self.rpmdb.searchNevra(name=po.name)
         # go through each package