Attachment 295173 Details for Bug 430115 – Have a fallback for determining architecture

[patch] Have a fallback for determining architecture

platform.diff (text/plain), 2.54 KB, created by Martin Sivák on 2008-02-18 15:17:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Sivák

Created: 2008-02-18 15:17:54 UTC

Size: 2.54 KB

patch

obsolete

>diff --git a/upgrade.py b/upgrade.py
>index f32aca1..27fd50a 100644
>--- a/upgrade.py
>+++ b/upgrade.py
>@@ -38,6 +38,9 @@ from product import productName
> import rhpl
> from rhpl.translate import _
> 
>+import rpm
>+import magic
>+
> import logging
> log = logging.getLogger("anaconda")
> 
>@@ -57,15 +60,66 @@ if rhpl.getArch() == "ppc":
> if rhpl.getArch() == "x86_64":
>     upgrade_remove_blacklist.extend( [("perl","i386")] )
> 
>+def guessGuestArch(rootdir):
>+    """root path -> None|"architecture"
>+    Guess the architecture of installed system
>+    """
>+
>+    architectures = dict()
>+    ts = rpm.ts(rootdir)
>+
>+    packages = ["kernel", "glibc", "filesystem", "initscripts"]
>+    files = ["/usr/sbin/libgcc_post_upgrade"]
>+
>+    #get information from packages
>+    for pkg in packages:
>+        try:
>+            mi=ts.dbMatch("name",pkg)
>+            for hdr in mi:
>+                architectures.setdefault(hdr["arch"], 0)
>+                architectures[hdr["arch"]]+=1
>+        except: #ignore guessing errors
>+            pass
>+
>+    #get arch info from files
>+    mc = magic.open(magic.MAGIC_NONE)
>+    mc.load()
>+    for f in files:
>+        try:
>+            hdr = mc.file(f).split()
>+            if hdr[0]=="ELF" and hdr[3]=="executable,":
>+                arch = hdr[4][:-1].replace("-", "_")
>+                architectures.setdefault(arch, 0)
>+                architectures[arch]+=1
>+        except: #ignore guessing errors
>+            pass
>+
>+    def lf(acc, x):
>+        if acc==None or acc[1]<x[1]:
>+            return x
>+        else:
>+            return acc
>+
>+    architecture = reduce(lf, architectures.iteritems(), None)
>+
>+    return architecture[0]
>+
>+
> def isUpgradingArch(anaconda):
>     """anaconda -> (bool, oldarch)
>     Check if the upgrade should change architecture of instalation"""
> 
>-    rpmplatform = open(anaconda.rootPath+"/etc/rpm/platform").readline().strip()
>-    rpmarch = rpmplatform[:rpmplatform.index("-")]
>-
>-    return rhpl.arch.canonArch!=rpmarch, rpmarch
>-
>+    try:
>+        rpmplatform = open(anaconda.rootPath+"/etc/rpm/platform").readline().strip()
>+        rpmarch = rpmplatform[:rpmplatform.index("-")]
>+        return rhpl.arch.canonArch!=rpmarch, rpmarch
>+    except IOError:
>+        #try some fallback methods
>+        rpmarch = guessGuestArch(anaconda.rootPath)
>+        if rpmarch:
>+            return rhpl.arch.canonArch!=rpmarch, rpmarch
>+        else:
>+            return False, "unknown"
> 
> def queryUpgradeArch(anaconda):
>     archupgrade, oldrpmarch = isUpgradingArch(anaconda) #Check if we are to upgrade the architecture of previous product

Actions: View | Diff

Attachments on bug 430115: 292814 | 295173 | 297490