]> git.ipfire.org Git - pakfire.git/commitdiff
arch: Rename arch variable to name
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Dec 2016 18:00:49 +0000 (19:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Dec 2016 18:00:49 +0000 (19:00 +0100)
Both don't sound right, but it makes more sense to use
arch.name than arch.arch.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/pakfire/arch.py

index 62a027a290537efb57c484889fd1756164e7d2a6..8bebbd560cf56713e62f7d9817bf1c69bece6add 100644 (file)
@@ -25,21 +25,21 @@ log = logging.getLogger("pakfire.arch")
 log.propagate = 1
 
 class Arch(object):
-       def __init__(self, arch):
-               self.arch = arch
+       def __init__(self, name):
+               self.name = name
 
        def __eq__(self, other):
-               return self.arch == other.arch
+               return self.name == other.name
 
        @property
        def platform(self):
                """
                        Returns the "class" this architecture belongs to.
                """
-               if self.arch.startswith("arm") or self.arch == "aarch64":
+               if self.name.startswith("arm") or self.name == "aarch64":
                        return "arm"
 
-               if self.arch in ("i686", "x86_64"):
+               if self.name in ("i686", "x86_64"):
                        return "x86"
 
                return "unknown"
@@ -52,9 +52,9 @@ class Arch(object):
                vendor = vendor.lower()
                assert vendor
 
-               s = "%s-%s-linux-gnu" % (self.arch, vendor)
+               s = "%s-%s-linux-gnu" % (self.name, vendor)
 
-               if self.arch.startswith("arm"):
+               if self.name.startswith("arm"):
                        s += "eabi"
 
                return s
@@ -88,7 +88,7 @@ class Arch(object):
                }
 
                try:
-                       return x[self.arch]
+                       return x[self.name]
                except KeyError:
                        return []
 
@@ -115,7 +115,7 @@ class Arch(object):
                }
 
                try:
-                       personality = arch2personality[self.arch]
+                       personality = arch2personality[self.name]
                except KeyError:
                        personality = None