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

Fix yumpkg*.mod_repo

Browse Source 
The kwargs are used to determine which values to assign to the repo
file, but additional "hidden" kwargs are passed to these functions, ones
with keys starting with a double underscore. This commit filters those
arguments out so that they don't get written to the repo file.
This commit is contained in:
Erik Johnson 2013-10-13 21:34:49 -05:00
parent bf484b94bf
commit 9ec63055e3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/yumpkg.py
View File

@ -1038,11 +1038,14 @@ def mod_repo(repo, basedir=None, **kwargs):
salt '*' pkg.mod_repo reponame basedir=/path/to/dir enabled=1 salt '*' pkg.mod_repo reponame basedir=/path/to/dir enabled=1
salt '*' pkg.mod_repo reponame baseurl= mirrorlist=http://host.com/ salt '*' pkg.mod_repo reponame baseurl= mirrorlist=http://host.com/
''' '''
# Filter out '__pub' arguments
repo_opts = dict((x, kwargs[x]) for x in kwargs if not x.startswith('__'))
# Build a list of keys to be deleted # Build a list of keys to be deleted
todelete = [] todelete = []
for key in kwargs.keys(): for key in repo_opts:
if kwargs[key] != 0 and not kwargs[key]: if repo_opts[key] != 0 and not repo_opts[key]:
del kwargs[key] del repo_opts[key]
todelete.append(key) todelete.append(key)
# Fail if the user tried to delete the name # Fail if the user tried to delete the name
@ -1064,11 +1067,11 @@ def mod_repo(repo, basedir=None, **kwargs):
# If the repo doesn't exist, create it in a new file # If the repo doesn't exist, create it in a new file
repofile = '{0}/{1}.repo'.format(basedir, repo) repofile = '{0}/{1}.repo'.format(basedir, repo)
if 'name' not in kwargs: if 'name' not in repo_opts:
return ('Error: The repo does not exist and needs to be created, ' return ('Error: The repo does not exist and needs to be created, '
'but a name was not given') 'but a name was not given')
if 'baseurl' not in kwargs and 'mirrorlist' not in kwargs: if 'baseurl' not in repo_opts and 'mirrorlist' not in repo_opts:
return ('Error: The repo does not exist and needs to be created, ' return ('Error: The repo does not exist and needs to be created, '
'but either a baseurl or a mirrorlist needs to be given') 'but either a baseurl or a mirrorlist needs to be given')
filerepos[repo] = {} filerepos[repo] = {}
@ -1079,11 +1082,11 @@ def mod_repo(repo, basedir=None, **kwargs):
# Error out if they tried to delete baseurl or mirrorlist improperly # Error out if they tried to delete baseurl or mirrorlist improperly
if 'baseurl' in todelete: if 'baseurl' in todelete:
if 'mirrorlist' not in kwargs and 'mirrorlist' \ if 'mirrorlist' not in repo_opts and 'mirrorlist' \
not in filerepos[repo].keys(): not in filerepos[repo].keys():
return 'Error: Cannot delete baseurl without specifying mirrorlist' return 'Error: Cannot delete baseurl without specifying mirrorlist'
if 'mirrorlist' in todelete: if 'mirrorlist' in todelete:
if 'baseurl' not in kwargs and 'baseurl' \ if 'baseurl' not in repo_opts and 'baseurl' \
not in filerepos[repo].keys(): not in filerepos[repo].keys():
return 'Error: Cannot delete mirrorlist without specifying baseurl' return 'Error: Cannot delete mirrorlist without specifying baseurl'
@ -1093,7 +1096,7 @@ def mod_repo(repo, basedir=None, **kwargs):
del filerepos[repo][key] del filerepos[repo][key]
# Old file or new, write out the repos(s) # Old file or new, write out the repos(s)
filerepos[repo].update(kwargs) filerepos[repo].update(repo_opts)
content = header content = header
for stanza in filerepos.keys(): for stanza in filerepos.keys():
comments = '' comments = ''