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 20093138247 for ; Sat, 14 Dec 2013 22:25:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69007E0B16; Sat, 14 Dec 2013 22:24:47 +0000 (UTC) Received: from qmta02.westchester.pa.mail.comcast.net (qmta02.westchester.pa.mail.comcast.net [76.96.62.24]) by pigeon.gentoo.org (Postfix) with ESMTP id 2EFD7E0B07 for ; Sat, 14 Dec 2013 22:24:46 +0000 (UTC) Received: from omta19.westchester.pa.mail.comcast.net ([76.96.62.98]) by qmta02.westchester.pa.mail.comcast.net with comcast id 1ZdV1n00227AodY51aQlFL; Sat, 14 Dec 2013 22:24:45 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta19.westchester.pa.mail.comcast.net with comcast id 1aQk1n00r152l3L3faQlZo; Sat, 14 Dec 2013 22:24:45 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id DDA21D68B34; Sat, 14 Dec 2013 14:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387059883; bh=EnhBbYl4NRHtuVF7QkSucJG/BXJQPOHVkXUL72NqVNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=HPJ7luSa1xaVYQGZTtF6ApeypNXMI/c3GsVEOsqgo1PkLleBgYVh20dsdrTkTN+nA RcjHjeWgRiHwZS+8fVC82Ov7dB6lh2MkHxh1lat1lam5JcHtgJWcEmzReWZeWgZLOR eTL2Q8Wg3sXwttlw2Jm9YpAhQdXiaka2GWaysI38= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v2 06/21] catalyst: Split confdefaults into line-per-entry Date: Sat, 14 Dec 2013 14:24:14 -0800 Message-Id: <6002517e994c4bc3d0b268427f82571552ed66c5.1387059467.git.wking@tremily.us> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387059885; bh=KttxiJgR8B820n4QksLVKeALVbDV1JyRrRbviQ/651g=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=HEXK0xr30Ed/aPUM56FwzQH9f429Z73dpUOlPUOS36Rww2q2D4lc+KGcTER6j3YfW WH2O42XU8jdwKGToorTRFGJ9+g8hhekdhKyMzVLSsMfbqnXEIF1tRvxj6L0Rh2tttZ z507SkDwsg+Tf0KQ6Dx6WX/9aVCPsXH0xlkvb5yT7ZbBp0l/fbMRTSSfQJC9gqgk6S i9Tlig79Cs6fJpods4q1S51NIoxqa4jBS1ct7IF8CJqm/EYx3/N80+m/18Z27qqyBv AOedjYn9bKtTi/fknA8no98Y/RIhgYiUyEOr/a3G/HiNR92YokAtUGeyPTkM9jubJE VYCX8EK6JrIiw== 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: 2e1cd61a-668e-4243-9274-afe99f3408c8 X-Archives-Hash: a869c52688c19b3368b1d2c6179c9cce 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 --- 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