X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Farchitecture.py;h=8354de02d2618387c414a0d0d4c85238bdc97575;hb=391f5ec09a119131dc846b796ca791f4cecc69e4;hp=110d522f1a63de13912e89a2b87398306f22ddb5;hpb=9e28920e7356504ca30dfc4e2717d1e61b324500;p=dak.git

diff --git a/daklib/architecture.py b/daklib/architecture.py
index 110d522f..8354de02 100644
--- a/daklib/architecture.py
+++ b/daklib/architecture.py
@@ -70,6 +70,9 @@ def Debian_arch_to_Debian_triplet(arch):
         else:
             return 'any', 'any', 'any'
 
+    if len(parts) == 2 and parts[0] == 'linux':
+        arch = parts[1]
+
     triplet = _triplettable()[1].get(arch, None)
     if triplet is None:
         return None
@@ -85,9 +88,9 @@ def match_architecture(arch, wildcard):
     triplet_arch = Debian_arch_to_Debian_triplet(arch)
     triplet_wildcard = Debian_arch_to_Debian_triplet(wildcard)
 
-    if len(triplet_arch) != 3:
+    if triplet_arch is None or len(triplet_arch) != 3:
         raise InvalidArchitecture('{0} is not a valid architecture name'.format(arch))
-    if len(triplet_wildcard) != 3:
+    if triplet_wildcard is None or len(triplet_wildcard) != 3:
         raise InvalidArchitecture('{0} is not a valid architecture name or wildcard'.format(wildcard))
 
     for i in range(0,3):