Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- /usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py 2013-09-27 01:35:32.000000000 +0200
- +++ /usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py.fixed 2013-10-17 00:11:09.000000000 +0200
- @@ -244,6 +244,9 @@
- fstr = '{0}.file_list'.format(fsb)
- if fstr in self.servers:
- ret.update(self.servers[fstr](load))
- + prefix = load.get('prefix', '').strip('/')
- + if prefix != '':
- + ret = [ f for f in ret if f.startswith(prefix) ]
- return sorted(ret)
- def file_list_emptydirs(self, load):
- @@ -257,6 +260,9 @@
- fstr = '{0}.file_list_emptydirs'.format(fsb)
- if fstr in self.servers:
- ret.update(self.servers[fstr](load))
- + prefix = load.get('prefix', '').strip('/')
- + if prefix != '':
- + ret = [ f for f in ret if f.startswith(prefix) ]
- return sorted(ret)
- def dir_list(self, load):
- @@ -270,4 +276,7 @@
- fstr = '{0}.dir_list'.format(fsb)
- if fstr in self.servers:
- ret.update(self.servers[fstr](load))
- + prefix = load.get('prefix', '').strip('/')
- + if prefix != '':
- + ret = [ f for f in ret if f.startswith(prefix) ]
- return sorted(ret)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement