[yum-cvs] 4 commits - rpmUtils/updates.py

[Seth Vidal]

 rpmUtils/updates.py |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a97198cccb8dead70fbb39a80df619ad21554ec0
Merge: 7bbfb5f... abb6895...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jul 31 15:56:46 2007 -0400

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum

commit 7bbfb5f4b34365184457605f69ce01622ee293b9
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jul 31 15:56:40 2007 -0400

    add git ignore?

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..52e4e61
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+*.pyo
commit ec4a2ff894106aa876306c36abc5daa09a8e67a5
Merge: d1352df... 7d8d8f1...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jul 31 15:53:22 2007 -0400

    Merge branch 'pkg-self-obsolete' of http://people.redhat.com/jantill/gits/yum

commit 7d8d8f1e879cccf38c62a4ccca2a900ed4248be7
Author: James Antill <james at code.and.org>
Date:   Mon Jul 30 16:12:40 2007 -0400

    fix for self obsoleting packages

diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py
index e574035..dc68b4f 100644
--- a/rpmUtils/updates.py
+++ b/rpmUtils/updates.py
@@ -151,6 +151,10 @@ class Updates:
                 if flag in [None, 0]: # unversioned obsolete
                     if pkgdict.has_key((obs_n, None)):
                         for (rpm_a, rpm_e, rpm_v, rpm_r) in pkgdict[(obs_n, None)]:
+                            # broken package obsoleting itself, rpm allows
+                            # this so just silently ignore it...
+                            if obs_n == name:
+                                continue
                             if not obsdict.has_key(pkgtup):
                                 obsdict[pkgtup] = []
                             obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))