valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11058 from hulu/lxc-templates

Browse Source 
avoid shadowing templates() within lxc module
This commit is contained in:
Thomas S Hatch 2014-03-07 15:17:25 -08:00
commit a729a9619b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/lxc.py
View File

@ -707,14 +707,14 @@ def templates(templates_dir='/usr/share/lxc/templates'):
salt '*' lxc.templates
'''
templates = []
templates_list = []
san = re.compile('^lxc-')
if os.path.isdir(templates_dir):
templates.extend(
templates_list.extend(
[san.sub('', a) for a in os.listdir(templates_dir)]
)
templates.sort()
return templates
templates_list.sort()
return templates_list
def info(name):