]> git.ipfire.org Git - pakfire.git/commitdiff
system: Fix reading CPU info.
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 May 2013 20:31:27 +0000 (20:31 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 May 2013 20:31:27 +0000 (20:31 +0000)
python/pakfire/system.py

index 1f0f6de6d519d0374d1b838ed83c2798e39634a9..a917461fd768bce943475f07db66479f3f7e3f00 100644 (file)
@@ -130,17 +130,19 @@ class System(object):
        def cpu_model(self):
                cpuinfo = self.parse_cpuinfo()
 
-               ret = None
-               if self.arch.startswith("arm"):
+               ret = cpuinfo.get("model name", None)
+
+               # Some ARM platforms do not provide "model name", so we
+               # try an other way.
+               if ret is None:
                        try:
                                ret = "%(Hardware)s - %(Processor)s" % cpuinfo
                        except KeyError:
                                pass
-               else:
-                       ret = cpuinfo.get("model name", None)
 
                # Remove too many spaces.
-               ret = " ".join(ret.split())
+               if ret:
+                       ret = " ".join(ret.split())
 
                return ret or _("Could not be determined")