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

Fix mod_repo crash on SourceEntry.architectures

Browse Source 
Fix failure when source entry object does not have the `architectures`
attribute; this attribute is tacked on if present in `kwargs`, but does
not exist on the SourceEntry class originally, and so mod_repo was
failing when `architectures` was not supplied.
This commit is contained in:
Gunnlaugur Þór Briem 2013-02-07 17:13:33 +00:00
parent e7f610eae0
commit c65cad4b0d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/apt.py
View File

@ -556,7 +556,8 @@ def _consolidate_repo_sources(sources):
repos = filter(lambda s: not s.invalid, sources.list) repos = filter(lambda s: not s.invalid, sources.list)
for r in repos: for r in repos:
key = str((r.architectures, r.disabled, r.type, r.uri)) key = str((getattr(r, 'architectures', []),
r.disabled, r.type, r.uri))
if key in consolidated: if key in consolidated:
combined = consolidated[key] combined = consolidated[key]
combined_comps = set(r.comps).union(set(combined.comps)) combined_comps = set(r.comps).union(set(combined.comps))
@ -602,7 +603,7 @@ def list_repos():
repo['type'] = source.type repo['type'] = source.type
repo['uri'] = source.uri repo['uri'] = source.uri
repo['line'] = source.line repo['line'] = source.line
repo['architectures'] = source.architectures repo['architectures'] = getattr(source, 'architectures', [])
repos.setdefault(source.uri, []).append(repo) repos.setdefault(source.uri, []).append(repo)
return repos return repos
@ -914,7 +915,7 @@ def mod_repo(repo, refresh=False, **kwargs):
if refresh is True or str(refresh).lower() == 'true': if refresh is True or str(refresh).lower() == 'true':
refresh_db() refresh_db()
return {repo: { return {repo: {
'architectures': mod_source.architectures, 'architectures': getattr(mod_source, 'architectures', []),
'comps': mod_source.comps, 'comps': mod_source.comps,
'disabled': mod_source.disabled, 'disabled': mod_source.disabled,
'file': mod_source.file, 'file': mod_source.file,