saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix a bunch of state_top issues

Browse source
This commit is contained in:
Thomas S Hatch 2011-05-28 16:43:15 -06:00
parent 01bbf9c530
commit dcb0bb5884
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/master.py
View file

@ -344,10 +344,10 @@ class MWorker(multiprocessing.Process):
if not load.has_key('path')\
or not load.has_key('loc')\
or not load.has_key('env'):
return False
return self.crypticle.dumps('')
path = self._find_file(load['path'], load['env'])
if not path:
return False
return self.crypticle.dumps('')
fn_ = open(path, 'rb')
fn_.seek(load['loc'])
return self.crypticle.dumps(fn_.read(self.opts['file_buffer_size']))
@ -361,7 +361,7 @@ class MWorker(multiprocessing.Process):
return False
path = self._find_file(load['path'], load['env'])
if not path:
return ''
return self.crypticle.dumps('')
ret = {}
ret['hsum'] = getattr(hashlib, self.opts['hash_type'])(
open(path, 'rb').read()).hexdigest()

2
salt/minion.py
View file

@ -352,7 +352,7 @@ class FileClient(object):
'''
if not path.startswith('salt://'):
raise MinionError('Unsupported path')
return path[:7]
return path[7:]
def get_file(self, path, dest, makedirs=False, env='base'):
'''

6
salt/state.py
View file

@ -306,10 +306,10 @@ class HighState(object):
opts['renderer'] = mopts['renderer']
if mopts['state_top'].startswith('salt://'):
opts['state_top'] = mopts['state_top']
elif not mopts['state_top'].startswith('/'):
opts['state_top'] = os.path.join('salt://', mopts['state_top'][1:])
elif mopts['state_top'].startswith('/'):
opts['state_top'] = os.path.join('salt://', mopts['state_top'][1:])
else:
opts['state_top'] = os.path.join('salt://', mopts['state_top'])
opts['state_top'] = os.path.join('salt://', mopts['state_top'])
return opts
def get_top(self):