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 <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>

diff --git a/catalyst b/catalyst
index ba26f3cfe43e7857017b2f3193f065ebaa99a8a3..e2291339e44b635695776387e16016e017819659 100755 (executable)
--- 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: