Merge pull request #3125 from fsniper/develop

Develop

salt/modules/apt.py

@@ -193,6 +193,10 @@ def install(name=None, refresh=False, fromrepo=None, skip_verify=False,
     if not fromrepo and repo:
         fromrepo = repo
 
+    if kwargs.get('env'):
+        print kwargs.get('env')
+        os.environ.update(kwargs.get('env'))
+
     if pkg_params is None or len(pkg_params) == 0:
         return {}
     elif pkg_type == 'file':
@@ -237,6 +241,9 @@ def remove(pkg):
     ret_pkgs = []
     old_pkgs = list_pkgs()
 
+    if kwargs.get('env'):
+        os.environ.update(kwargs.get('env'))
+
     cmd = 'apt-get -q -y remove {0}'.format(pkg)
     __salt__['cmd.run'](cmd)
     new_pkgs = list_pkgs()
@@ -261,6 +268,9 @@ def purge(pkg):
     ret_pkgs = []
     old_pkgs = list_pkgs()
 
+    if kwargs.get('env'):
+        os.environ.update(kwargs.get('env'))
+
     # Remove inital package
     purge_cmd = 'apt-get -q -y purge {0}'.format(pkg)
     __salt__['cmd.run'](purge_cmd)

scripts/salt

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 Publish commands to the salt system from the command line on the master.
 '''

scripts/salt-call

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 Directly call a salt command in the modules, does not require a running salt
 minion to run.

scripts/salt-cp

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 Publish commands to the salt system from the command line on the master.
 '''

scripts/salt-key

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 Manage the authentication keys with salt-key
 '''

scripts/salt-master

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 Start the salt-master
 '''

scripts/salt-minion

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 This script is used to kick off a salt minion daemon
 '''

scripts/salt-run

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 Execute a salt convenience routine
 '''

scripts/salt-syndic

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''
 This script is used to kick off a salt syndic daemon
 '''