* ubuntutools/misc.py:

- Use output of dpkg --print-architecture command to correctly display
    platform architecture

debian/changelog

@@ -8,8 +8,11 @@ ubuntu-dev-tools (0.103) UNRELEASED; urgency=low
     - Add Benjamin Drung to Uploaders.
     - Add DM-Upload-Allowed field, this way Benjamin can upload new
       versions on his own.
+  * ubuntutools/misc.py:
+    - Use output of dpkg --print-architecture command to correctly display
+      platform architecture (Closes: #594424).
 
- -- Luca Falavigna <dktrkranz@debian.org>  Mon, 20 Sep 2010 17:46:46 +0200
+ -- Luca Falavigna <dktrkranz@debian.org>  Mon, 20 Sep 2010 18:11:24 +0200
 
 ubuntu-dev-tools (0.102) experimental; urgency=low
 

ubuntutools/misc.py

@@ -22,6 +22,7 @@
 
 # Modules.
 import os
+from subprocess import Popen, PIPE
 
 from ubuntutools.lp.udtexceptions import PocketDoesNotExistError
 
@@ -52,21 +53,20 @@ def system_distribution():
 def host_architecture():
     """ host_architecture -> string
     
-    Detect the host's architecture and return it as a string
+    Detect the host's architecture and return it as a string. If the
-    (i386/amd64/other values). If the architecture can't be determined,
+    architecture can't be determined, print an error message and return None.
-    print an error message and return None.
     
     """
     
-    arch = os.uname()[4].replace('x86_64', 'amd64').replace('i586', 'i386'
+    arch = Popen(['dpkg', '--print-architecture'], stdout=PIPE, \
-        ).replace('i686', 'i386')
+                 stderr=PIPE).communicate()[0].split()
     
-    if not arch or 'not found' in arch:
+    if not arch or 'not found' in arch[0]:
         print 'Error: Not running on a Debian based system; could not ' \
             'detect its architecture.'
         return None
     
-    return arch
+    return arch[0]
 
 def readlist(filename, uniq=True):
     """ readlist(filename, uniq) -> list