Merge pull request devstructure#137 from cpbills/master

Debian multi-arch support fix

blueprint/backend/apt.py

@@ -2,6 +2,7 @@
 Search for `apt` packages to include in the blueprint.
 """
 
+import os
 import logging
 import subprocess
 
@@ -11,13 +12,22 @@
 def apt(b, r):
     logging.info('searching for APT packages')
 
+    # define a default output format string for dpkg-query
+    output_format = '${Status}\x1E${binary:Package}\x1E${Version}\n'
+
+    # try running dpkg --print-foreign-architectures to see if dpkg is
+    # multi-arch aware. if not, revert to old style output_format
+    with open(os.devnull, 'w') as fnull:
+        rv = subprocess.call(['dpkg', '--print-foreign-architectures'],
+                                stdout = fnull, stderr = fnull)
+        if rv != 0:
+            output_format = '${Status}\x1E${Package}\x1E${Version}\n'
+
     # Try for the full list of packages.  If this fails, don't even
     # bother with the rest because this is probably a Yum/RPM-based
     # system.
     try:
-        p = subprocess.Popen(['dpkg-query',
-                              '-f=${Status}\x1E${Package}\x1E${Version}\n',
-                              '-W'],
+        p = subprocess.Popen(['dpkg-query','-Wf', output_format],
                              close_fds=True, stdout=subprocess.PIPE)
     except OSError:
         return