[yum-commits] Branch 'yum-3_2_X' - 2 commits - rpmUtils/arch.py rpmUtils/tests

[skvidal at osuosl.org]

 rpmUtils/arch.py               |    5 ++---
 rpmUtils/tests/updates-test.py |   17 ++++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit bce3a3c4181b0173c746b2ea2f67a34b28fb2f92
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Sep 8 11:54:33 2010 -0400

    remove duplicate sparc64v entry which, apparently, does nothing

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index 2f7c2e5..72cba60 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -36,7 +36,6 @@ arches = {
     "s390": "noarch",
     
     # sparc
-    "sparc64v": "sparc64",
     "sparc64v": "sparcv9v",
     "sparc64": "sparcv9",
     "sparcv9v": "sparcv9",
commit a487c093c2c7c5e5c594ae866a6c740aabe367df
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Sep 7 16:27:18 2010 -0400

    - fix sparcv9/sparc64 update comparison case due to weird multicompat setting - this should fix A LOT of oddball complex update cases
    - add better test in  updates-test.py to let us set the arch to test more easily

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index 5512ea6..2f7c2e5 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -5,8 +5,8 @@ import os
 
 # dict mapping arch -> ( multicompat, best personality, biarch personality )
 multilibArches = { "x86_64":  ( "athlon", "x86_64", "athlon" ),
-                   "sparc64v": ( "sparc", "sparcv9v", "sparc64v" ),
-                   "sparc64": ( "sparc", "sparcv9", "sparc64" ),
+                   "sparc64v": ( "sparcv9v", "sparcv9v", "sparc64v" ),
+                   "sparc64": ( "sparcv9", "sparcv9", "sparc64" ),
                    "ppc64":   ( "ppc", "ppc", "ppc64" ),
                    "s390x":   ( "s390", "s390x", "s390" ),
                    }
diff --git a/rpmUtils/tests/updates-test.py b/rpmUtils/tests/updates-test.py
index 524db82..889353e 100644
--- a/rpmUtils/tests/updates-test.py
+++ b/rpmUtils/tests/updates-test.py
@@ -1,5 +1,6 @@
 
 import rpmUtils.updates
+import rpmUtils.arch
 
 instlist = [('foo', 'i386', '0', '1', '1'),
             ('do', 'i386', '0', '2', '3'),
@@ -7,7 +8,8 @@ instlist = [('foo', 'i386', '0', '1', '1'),
             ('bar', 'noarch', '0', '2', '1'),
             ('baz', 'i686', '0', '2', '3'),
             ('baz', 'x86_64', '0','1','4'),
-            ('foo', 'i686', '0', '1', '1')]
+            ('foo', 'i686', '0', '1', '1'),
+            ('cyrus-sasl','sparcv9', '0', '1', '1')]
 
 availlist = [('foo', 'i686', '0', '1', '3'),
              ('do', 'noarch', '0', '3', '3'), 
@@ -20,7 +22,9 @@ availlist = [('foo', 'i686', '0', '1', '3'),
              ('baz', 'noarch', '0', '2', '4'),
              ('baz', 'i686', '0', '2', '4'),
              ('baz', 'x86_64', '0', '1', '5'),
-             ('baz', 'ppc', '0', '1', '5')]
+             ('baz', 'ppc', '0', '1', '5'),
+             ('cyrus-sasl','sparcv9', '0', '1', '2'),
+             ('cyrus-sasl','sparc64', '0', '1', '2'),]
 
 obslist = {('quux', 'noarch', '0', '1', '3'): [('bar', None, (None, None, None))],
 
@@ -30,9 +34,12 @@ obslist = {('quux', 'noarch', '0', '1', '3'): [('bar', None, (None, None, None))
 
 up = rpmUtils.updates.Updates(instlist, availlist)
 up.debug=1
-up.exactarch=0
-up.exactarchlist.append('foo')
-#up.myarch = 'x86_64'
+up.exactarch=1
+#up.myarch = 'sparc64'
+up._is_multilib = rpmUtils.arch.isMultiLibArch(up.myarch)
+up._archlist = rpmUtils.arch.getArchList(up.myarch)
+print up._archlist
+up._multilib_compat_arches = rpmUtils.arch.getMultiArchInfo(up.myarch)
 up.doUpdates()
 up.condenseUpdates()