From fd4dbf0ffeffabce1a9244bc3c1df740bc9be5ed Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Thu, 26 May 2011 23:46:19 -0600
Subject: [PATCH] Add environment passing to the file client

---
 salt/minion.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/salt/minion.py b/salt/minion.py
index 6f0900d3e2..5aaf788af2 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -323,7 +323,7 @@ class FileClient(object):
             raise MinionError('Unsupported path')
         return path[:7]
         
-    def get_file(self, path, dest, makedirs=False):
+    def get_file(self, path, dest, makedirs=False, env='base'):
         '''
         Get a single file from the salt-master
         '''
@@ -337,6 +337,7 @@ class FileClient(object):
                 return False
         fn_ = open(dest, 'w+')
         load = {'path': path,
+                'env': env,
                 'cmd': '_serve_file'}
         while True:
             load['loc'] = fn_.tell()
@@ -348,25 +349,25 @@ class FileClient(object):
             fn_.write(data)
         return dest
 
-    def cache_file(self, path):
+    def cache_file(self, path, env='base'):
         '''
         Pull a file down from the file server and store it in the minion file
         cache
         '''
         dest = os.path.join(self.opts['cachedir'], 'files', path)
-        return self.get_file(path, dest, True)
+        return self.get_file(path, dest, True, env)
 
-    def cache_files(self, paths):
+    def cache_files(self, paths, env='base'):
         '''
         Download a list of files stored on the master and put them in the minion
         file cache
         '''
         ret = []
         for path in paths:
-            ret.append(self.cache_file(path))
+            ret.append(self.cache_file(path, env))
         return ret
 
-    def hash_file(self, path):
+    def hash_file(self, path, env='base'):
         '''
         Return the hash of a file, to get the hash of a file on the
         salt master file server prepend the path with salt://<file on server>
@@ -375,6 +376,7 @@ class FileClient(object):
         path = self._check_proto(path)
         payload = {'enc': 'aes'}
         load = {'path': path,
+                'env': env,
                 'cmd': '_file_hash'}
         payload['load'] = self.auth.crypticle.dumps(load)
         self.socket.send_pyobj(payload)