Attachment 153249 Details for Bug 237413 – Always check machine before platform

[patch] Always check machine before platform

rhpl-detect-pegasos.patch (text/plain), 1.10 KB, created by David Woodhouse on 2007-04-22 10:43:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-04-22 10:43:49 UTC

Size: 1.10 KB

patch

obsolete

>Index: src/__init__.py
>===================================================================
>RCS file: /usr/local/CVS/rhpl/src/__init__.py,v
>retrieving revision 1.9
>diff -u -p -r1.9 __init__.py
>--- src/__init__.py	16 Apr 2007 14:27:41 -0000	1.9
>+++ src/__init__.py	22 Apr 2007 10:37:14 -0000
>@@ -49,15 +49,19 @@ def getPPCMachine():
>     lines = f.readlines()
>     f.close()
>     for line in lines:
>-        if line.find('machine') != -1 or line.find('platform') != -1:
>+        if line.find('machine') != -1:
>             machine = line.split(':')[1]
>-            break
>+        elif line.find('platform') != -1:
>+            platform = line.split(':')[1]
> 
>-    if machine is None:
>-        return None
>+    if machine is not None:
>+        for type in ppcType.items():
>+            if machine.find(type[0]) != -1:
>+                return type[1]
> 
>-    for type in ppcType.items():
>-        if machine.find(type[0]) != -1:
>-            return type[1]
>+    if platform is not None:
>+        for type in ppcType.items():
>+            if platform.find(type[0]) != -1:
>+                return type[1]
> 
>-    return 0
>+    return None

Actions: View | Diff

Attachments on bug 237413: 153249