x/cloud-init
Code Issues Proposed changes

More cleanups, fix header function.

Browse Source
This commit is contained in:
Joshua Harlow 2012-10-17 09:42:22 -07:00
parent c75870956e
commit 612303361f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cloudinit/config/cc_yum_add_repo.py
View File

@ -53,7 +53,7 @@ def _format_repository_config(repo_id, repo_config):
# the format of yum and don't verify keys/values further # the format of yum and don't verify keys/values further
to_be[repo_id][k] = _format_repo_value(v) to_be[repo_id][k] = _format_repo_value(v)
lines = to_be.write() lines = to_be.write()
lines.insert(0, util.make_header()) lines.insert(0, "# Created by cloud-init on %s" % (util.time_rfc2822()))
return "\n".join(lines) return "\n".join(lines)
@ -87,12 +87,19 @@ def handle(name, cfg, _cloud, log, _args):
if k: if k:
n_repo_config[k] = v n_repo_config[k] = v
repo_config = n_repo_config repo_config = n_repo_config
if not 'baseurl' in repo_config: missing_required = 0
log.warn("Repository %s does not contain a baseurl address", for req_field in ['baseurl']:
repo_id) if not req_field in repo_config:
else: log.warn(("Repository %s does not contain a %s"
" configuration 'required' entry"),
repo_id, req_field)
missing_required += 1
if not missing_required:
repo_configs[canon_repo_id] = repo_config repo_configs[canon_repo_id] = repo_config
repo_locations[canon_repo_id] = repo_fn_pth repo_locations[canon_repo_id] = repo_fn_pth
else:
log.warn("Repository %s is missing %s required fields, skipping!",
repo_id, missing_required)
for (c_repo_id, path) in repo_locations.items(): for (c_repo_id, path) in repo_locations.items():
repo_blob = _format_repository_config(c_repo_id, repo_blob = _format_repository_config(c_repo_id,
repo_configs.get(c_repo_id)) repo_configs.get(c_repo_id))