From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C970A138247 for ; Sun, 15 Dec 2013 04:01:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D9C4E0B2A; Sun, 15 Dec 2013 04:00:58 +0000 (UTC) Received: from QMTA11.westchester.pa.mail.comcast.net (qmta11.westchester.pa.mail.comcast.net [76.96.59.211]) by pigeon.gentoo.org (Postfix) with ESMTP id 62EA1E0B20 for ; Sun, 15 Dec 2013 04:00:57 +0000 (UTC) Received: from omta22.westchester.pa.mail.comcast.net ([76.96.62.73]) by QMTA11.westchester.pa.mail.comcast.net with comcast id 1fzT1n0071ap0As5Bg0x1y; Sun, 15 Dec 2013 04:00:57 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta22.westchester.pa.mail.comcast.net with comcast id 1g0v1n00Z152l3L3ig0wrx; Sun, 15 Dec 2013 04:00:56 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id E9D90D69954; Sat, 14 Dec 2013 20:00:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387080054; bh=NQtBHJMuZvT9CX0KNMvs1BEIUTZh3RmOmd4HwpDzrc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=syz2ADPIu83ea70v8fuAPGe/BKA4dtbhXUFOm0p9s8SK6md7ARkzGlj6of33PtIVM /CtyHuWczWyLu1p9Imbkzqp7AK7hasexC+o4ZVaYA1/UwRuYRWZ8ezs/g6WTSCbsHb veV3+OktYACXvQXUjNr1CI9MG/uJXIYNvX6xrhng= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v3 06/19] catalyst: Split confdefaults into line-per-entry Date: Sat, 14 Dec 2013 20:00:32 -0800 Message-Id: X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: <20131215032258.GK25409@odin.tremily.us> In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387080057; bh=edrHSlGAKlwEnfikLDY9Uc8qI1CtycpUI6u5TNxoSmM=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=DzMx+fn9AvJR9ivHO/FxnkL6OCq7EMBhztx0NJ3vyUH9SqI+F+4VqFDKtDIAe8reP ApBz+W7QiJWVEazvuuvxm92/WYMKtzGIxKoT7MRou4QdFibF0yT8oYJJA+GGbqgoen nXtupakV7jpuah42yNDn86vHOxVcKhIzAfljG3ma1vEa1BH/qIWbjKAUb12yODn52y So1Ujew0tXQIZAPJYBmGvIjE/QfGWNwZDG88MF5JYvNh15EezblEDl1uv8HV4rubE4 g45AegbEJkl2pJ+3iInNfk19/UPhTQ6VC8ppvZJTTbDayk4WOBxJe9rqGGO6a/KLv0 Nd09OK4BC9HUw== Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: a771906d-4aed-4f56-8ca1-88d5ecbb835a X-Archives-Hash: 30ce537a26af519802f87f42f6addecc From: Brian Dolbec 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. Signed-off-by: W. Trevor King Signed-off-by: Brian Dolbec --- catalyst | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/catalyst b/catalyst index ba26f3c..e229133 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: -- 1.8.3.2