[yum-cvs] rpmUtils/arch.py

[Seth Vidal]

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

New commits:
commit 243318944acaee06a904c72e2eea22b2326b93a8
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Nov 30 11:06:55 2007 -0500

    apply Dennis Gilmore's patch for geode arch support

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index db56d10..b710015 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -16,6 +16,7 @@ arches = {
     # ia32
     "athlon": "i686",
     "i686": "i586",
+    "geode": "i586",
     "i586": "i486",
     "i486": "i386",
     "i386": "noarch",
@@ -152,6 +153,15 @@ def getArchList(thisarch=None):
         
 
 def getCanonX86Arch(arch):
+    # 
+    if arch = "i586":
+        f = open("/proc/cpuinfo", "r")
+        lines = f.readlines()
+        f.close()
+        for line in lines:
+            if line.startswith("model name") and line.find("Geode(TM)") != -1:
+                return "geode"
+        return arch
     # only athlon vs i686 isn't handled with uname currently
     if arch != "i686":
         return arch