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

[James Antill]

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

New commits:
commit f98c66713ef424c5524bc3b303400587c190479e
Author: James Antill <james at and.org>
Date:   Mon Nov 15 15:34:45 2010 -0500

    Don't just delete obs. pkgs. (in history undo). BZ 652767.

diff --git a/yum/__init__.py b/yum/__init__.py
index f2a698d..e036f86 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -4250,6 +4250,11 @@ class YumBase(depsolve.Depsolve):
                     done = True
         for pkg in transaction.trans_data:
             if pkg.state == 'Obsoleting':
+                #  Note that obsoleting can mean anything, so if this is part of
+                # something else, it should be done by now (so do nothing).
+                if self.tsInfo.getMembers(pkg.pkgtup):
+                    continue
+                #  If not it should be an install/obsolete ... so remove it.
                 if self.remove(pkgtup=pkg.pkgtup):
                     done = True
         for pkg in transaction.trans_data: