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

Broke the parsing of the formula entry into a separate functions

Browse Source
This commit is contained in:
Gregory Ballantine 2017-07-19 13:09:16 -04:00
parent 805758c295
commit 9b0c48a8e1
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt-formula-manager.py
View File

@ -32,6 +32,19 @@ def check_formula_dir(formulas_dir):
def get_formulas(formulas, formulas_dir, formulas_url): def get_formulas(formulas, formulas_dir, formulas_url):
# loop through the defined formulas # loop through the defined formulas
for formula in formulas: for formula in formulas:
git_url, local_path = parse_formula_entry(formula, formulas_dir, formulas_url)
# check if the destination directory exists
if os.path.exists(local_path):
print(local_path + ' already exists, so we\'re skipping this.')
else:
print('Downloading ' + git_url + ' into ' + local_path)
# clone git repo
Repo.clone_from(git_url, local_path)
# parses a formula entry, and then returns the target git URL and the destination for the clone
def parse_formula_entry(formula, formulas_dir, formulas_url):
# define our variables to be returned
git_url = '' git_url = ''
local_path = '' local_path = ''
@ -49,13 +62,8 @@ def get_formulas(formulas, formulas_dir, formulas_url):
print('One of your entries is not a dict or a string (' + str(formula) + ') - please fix this.') print('One of your entries is not a dict or a string (' + str(formula) + ') - please fix this.')
sys.exit(1) sys.exit(1)
# check if the destination directory exists # return the values here
if os.path.exists(local_path): return git_url, local_path
print(local_path + ' already exists, so we\'re skipping this.')
else:
print('Downloading ' + git_url + ' into ' + local_path)
# clone git repo
Repo.clone_from(git_url, local_path)
# purge un-managed formulas # purge un-managed formulas
def clean_formulas(conf): def clean_formulas(conf):