Metaunix/salt-formula-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed the Formula class' search for name

Browse Source
This commit is contained in:
Gregory Ballantine 2017-08-02 10:59:16 -04:00
parent a7b7baec9d
commit 6ce4077856
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Formula.py
View File

@ -25,13 +25,15 @@ class Formula():
# check if the formula's name was defined # check if the formula's name was defined
if not 'name' in self.formula_def: if not 'name' in self.formula_def:
# set the formula's name if need be # set the formula's name if need be
name_partial = [k for i, k in enumerate(self.formula_def.keys()) if i == 0][0] name_partial = [k for k, v in self.formula_def.items() if v == None][0]
self.formula_def['name'] = name_partial + '-formula' self.formula_def['name'] = name_partial + '-formula'
# check if the dictionary has a git URL defined # check if the dictionary has a git URL defined
if 'url' in self.formula_def: if 'url' in self.formula_def:
git_url = str(self.formula_def['url']) git_url = str(self.formula_def['url'])
else: else:
git_url = str(self.formulas_url) + str(self.formula_def['name']) git_url = str(self.formulas_url) + str(self.formula_def['name'])
# put together the local # put together the local
local_path = str(self.formulas_dir) + '/' + str(self.formula_def['name']) local_path = str(self.formulas_dir) + '/' + str(self.formula_def['name'])
elif isinstance(self.formula_def, str): elif isinstance(self.formula_def, str):