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

Seth Vidal skvidal at linux.duke.edu
Sun Sep 21 00:38:30 UTC 2008


 rpmUtils/arch.py |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cd4de80131e4556d639e4da6b821c4ed86ad4af1
Merge: 3eee967... 935c802...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Sat Sep 20 20:37:28 2008 -0400

    Merge branch 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      groups are already sorted, so sort the contents. Makes comps stable.
      Use sys.exit instead of exit as it's not a keyword in python.

commit 3eee9671be585acbbce6c306af08d4279d29eb23
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Sat Sep 20 20:37:19 2008 -0400

    make sure noarch is added to all the freaky-deaky arches

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index d90659d..5402455 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -177,6 +177,9 @@ def getArchList(thisarch=None):
     if archlist[0] == "sparc64v":
         archlist.insert(1,"sparc64")
     
+    # if we're a weirdo arch - add noarch on there.
+    if len(archlist) == 1 and archlist[0] == thisarch:
+        archlist.append('noarch')
     return archlist
     
         



More information about the Yum-cvs-commits mailing list