[yum-git] 2 commits - yum/depsolve.py yum/sqlitesack.py

[James Antill]

 yum/depsolve.py   |   12 ++++++++++++
 yum/sqlitesack.py |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 7f6eba39bf392e97abe7036a1c5efd0f0876eda0
Author: James Antill <james at and.org>
Date:   Mon Mar 3 13:20:30 2008 -0500

    Fix typo fix

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 6027b5b..a1f4ba9 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -848,7 +848,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
                 pmatches = self._sql_pkgKey2po(rep, cur)
                 if len(pmatches):
                     unmatched.remove(p)
-                matched.extend(pmatches)
+                matchres.extend(pmatches)
 
         exactmatch = misc.unique(exactmatch)
         matched = misc.unique(matched)
commit 11f7ae90007297401fa22b10186ef3b9083d3621
Author: James Antill <james at and.org>
Date:   Mon Feb 25 17:45:20 2008 -0500

    Work around for python-2.4.x

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 714f041..0e1aa51 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -39,6 +39,18 @@ from i18n import _
 import warnings
 warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
 
+try:
+	assert max(2, 4) == 4
+except:
+	# Python-2.4.x doesn't have min/max ... *sigh*
+        def min(x, *args): 
+            for y in args:
+                if x > y: x = y
+            return x
+        def max(x, *args):
+            for y in args:
+                if x < y: x = y
+            return x
 flags = {"GT": rpm.RPMSENSE_GREATER,
          "GE": rpm.RPMSENSE_EQUAL | rpm.RPMSENSE_GREATER,
          "LT": rpm.RPMSENSE_LESS,