From 91c389d1b1e91a791bc52e9d20a5cacbb76f7b91 Mon Sep 17 00:00:00 2001
From: "Christopher P. Bills" <cpbills@fauxtographer.net>
Date: Mon, 6 May 2013 22:59:47 -0700
Subject: [PATCH] fixed redirecting command output to null

did not test the last commit, sorry.
---
 blueprint/backend/apt.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/blueprint/backend/apt.py b/blueprint/backend/apt.py
index 1ea98b7..479b2d8 100644
--- a/blueprint/backend/apt.py
+++ b/blueprint/backend/apt.py
@@ -2,6 +2,7 @@
 Search for `apt` packages to include in the blueprint.
 """
 
+import os
 import logging
 import subprocess
 
@@ -16,16 +17,17 @@ def apt(b, r):
 
     # try running dpkg --print-foreign-architectures to see if dpkg is
     # multi-arch aware. if not, revert to old style output_format
-    rv = subprocess.call(['dpkg', '--print-foreign-architectures'],
-                            stdout=FNULL, stderr=subprocess.STDOUT)
-    if rv != 0:
-        output_format = '${Status}\x1E${Package}\x1E${Version}\n'
+    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','-Wf',output_format],
+        p = subprocess.Popen(['dpkg-query','-Wf', output_format],
                              close_fds=True, stdout=subprocess.PIPE)
     except OSError:
         return