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

[skvidal at osuosl.org]

 yum/packages.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 071dd235befb477c7701e61eb7cb07a651044df7
Merge: 5f99d07 5a13788
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jun 21 14:54:32 2011 -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:
      Fix a leaked file descriptor

commit 5f99d07ffc01a7d5f39c62153efd6f48691c911d
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jun 21 14:04:36 2011 -0400

    add check to make sure rest in the libc collapsing is not a single item
    list.

diff --git a/yum/packages.py b/yum/packages.py
index d8043f9..5ef9951 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1186,7 +1186,7 @@ class YumAvailablePackage(PackageObject, RpmBase):
             if libc_requires:
                 rest = sorted(libc_requires, cmp=compareVerOnly, key=itemgetter(0))
                 best = rest.pop()
-                if best[0].startswith('libc.so.6()'): # rpmvercmp will sort this one as 'highest' so we need to remove it from the list
+                if len(rest) > 0 and best[0].startswith('libc.so.6()'): # rpmvercmp will sort this one as 'highest' so we need to remove it from the list
                     best = rest.pop()
                 newlist = []
                 for i in mylist: