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

[skvidal at osuosl.org]

 yum/packages.py   |    2 +-
 yum/sqlitesack.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 17aa29b5893e65831476b7fb06227234364f83eb
Merge: ff93cd1 6f07032
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Jul 15 11:45:47 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: (3 commits)
      Adds documentation for the cli module.
      ...

commit ff93cd1a76a86bec43b2c712cab637bf4bfcdff7
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Jul 15 11:42:02 2011 -0400

    make the test !=0 instead of == 1

diff --git a/yum/packages.py b/yum/packages.py
index 4b1265c..e055edf 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1217,7 +1217,7 @@ class YumAvailablePackage(PackageObject, RpmBase):
                     prcostring += ''' ver="%s"''' % misc.to_xml(v, attrib=True)
                 if r:
                     prcostring += ''' rel="%s"''' % misc.to_xml(r, attrib=True)
-            if pre == "1":
+            if pre != "0":
                 prcostring += ''' pre="%s"''' % pre
                     
             prcostring += "/>\n"
commit 5cc20cc6581ae621d163207c1ce57b3b0776af98
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Jul 15 11:21:21 2011 -0400

    the "0" string of pre returns as valid on the if pre check. So turn it
    into a check for "1" so our requires don't always include pre="0"
    when they don't really need to.

diff --git a/yum/packages.py b/yum/packages.py
index 5ef9951..4b1265c 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1217,7 +1217,7 @@ class YumAvailablePackage(PackageObject, RpmBase):
                     prcostring += ''' ver="%s"''' % misc.to_xml(v, attrib=True)
                 if r:
                     prcostring += ''' rel="%s"''' % misc.to_xml(r, attrib=True)
-            if pre:
+            if pre == "1":
                 prcostring += ''' pre="%s"''' % pre
                     
             prcostring += "/>\n"
commit 0e9bdf0b7d78a735319751692d3af5ae5ed20537
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Jul 15 11:17:15 2011 -0400

    when you .lower() a string you want to compare it
    to lowercase values, not uppercase ones.

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 8a6f6f3..19193ad 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -406,7 +406,7 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
         requires = []
         for ob in cur:
             pre = "0"
-            if ob['pre'].lower() in ['TRUE', 1]:
+            if ob['pre'].lower() in ['true', 1]:
                 pre = "1"
             prco_set = (_share_data(ob['name']), _share_data(ob['flags']),
                         (_share_data(ob['epoch']),