Fix other reference to APT_ENV_VARS.

8588ac5f · Michael DeHaan · 3bb3ce44 · 8588ac5f
Commit 8588ac5f authored Mar 11, 2014 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

library/packaging/apt
+5 -1

No files found.
--- a/library/packaging/apt
+++ b/library/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: