From: Brian Dolbec Date: Tue, 8 Jan 2013 07:17:22 +0000 (-0800) Subject: catalyst: Split confdefaults into line-per-entry X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=392d73b077643a23e7f17a54f34b5046ed456492;p=catalyst.git catalyst: Split confdefaults into line-per-entry This makes it easy to find the key you're looking for. Future additions and removals will also have cleaner diffs. W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Reviewed-by: Matt Turner Signed-off-by: W. Trevor King Signed-off-by: Brian Dolbec --- diff --git a/catalyst b/catalyst index ba26f3cf..e2291339 100755 --- a/catalyst +++ b/catalyst @@ -61,11 +61,15 @@ def parse_config(myconfig): myconf={} config_file="" - confdefaults={ "storedir":"/var/tmp/catalyst",\ - "sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\ - "portdir":"/usr/portage","options":"",\ - "snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\ - "hash_function":"crc32"} + confdefaults = { + "distdir": "/usr/portage/distfiles", + "hash_function": "crc32", + "options": "", + "portdir": "/usr/portage", + "sharedir": "/usr/share/catalyst", + "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", + "storedir": "/var/tmp/catalyst", + } # first, try the one passed (presumably from the cmdline) if myconfig: