From 11146a52f1f5b4cc2abc44e2f6863dabff18ba49 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansible.com>
Date: Tue, 11 Mar 2014 10:47:53 -0400
Subject: [PATCH] Fix other reference to APT_ENV_VARS.

---
 packaging/apt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packaging/apt b/packaging/apt
index f11ab73de19..311bfa1199b 100644
--- a/packaging/apt
+++ b/packaging/apt
@@ -343,7 +343,11 @@ def upgrade(m, mode="yes", force=False,
         force_yes = ''
 
     apt_cmd_path = m.get_bin_path(apt_cmd, required=True)
-    cmd = '%s %s -y %s %s %s %s' % (APT_ENVVARS, apt_cmd_path, dpkg_options,
+
+    for (k,v) in APT_ENV_VARS.iteritems():
+        os.environ[k] = v
+
+    cmd = '%s -y %s %s %s %s' % (apt_cmd_path, dpkg_options,
                                     force_yes, check_arg, upgrade_command)
     rc, out, err = m.run_command(cmd)
     if rc: