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 A940A13894B for ; Sat, 9 Feb 2013 20:46:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78F8B21C0BD; Sat, 9 Feb 2013 20:45:53 +0000 (UTC) Received: from vms173015pub.verizon.net (vms173015pub.verizon.net [206.46.173.15]) by pigeon.gentoo.org (Postfix) with ESMTP id 0937821C0BD for ; Sat, 9 Feb 2013 20:45:52 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.84.219]) by vms173015.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MHZ005W30C82630@vms173015.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Sat, 09 Feb 2013 14:45:45 -0600 (CST) Received: by odin.tremily.us (Postfix, from userid 1000) id 859E4878C96; Sat, 09 Feb 2013 15:45:44 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1360442744; bh=sfq+3q1z+X4YTttCg3+PQEMmtb03vrwuW/edDxLtI0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=sNY6m5BmxJPwCaFmONGuVTg/zJ9vMefJPO+AGDaGrrl/kCZhPif6oMx7pXiltXMEd J3/k+Gc1YlFLKDGkIOcuKeHLyIXTdJXhQbvr+zLQZosBv8luynN5hFq1CGL3MSpaEy tU37JPM0OdtZ71SSaulhSDK5VfEZbr7vNO53enBI= From: "W. Trevor King" To: Catalyst Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 2/6] generic_stage_target: Split ._copy_kernel_config() from ._build_kernel() Date: Sat, 09 Feb 2013 15:45:34 -0500 Message-id: <8b864e5f9a8127ae82e49c4ad4c88f42d04dbb2a.1360442556.git.wking@tremily.us> X-Mailer: git-send-email 1.7.12.4 In-reply-to: References: In-reply-to: References: 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: 4ed0f627-42ac-4e63-b3da-95a641503181 X-Archives-Hash: 86382d3c44115f1edbbfd00c7b2da63e From: "W. Trevor King" _copy_kernel_config() is one idea with a bunch of error handling. Isolating it in its own function makes _build_kernel() easier to read. --- modules/generic_stage_target.py | 49 ++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index af7cbe7..2c32c00 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1426,29 +1426,7 @@ class generic_stage_target(generic_target): +"build_kernel_"+kname): print "Resume point detected, skipping build_kernel for "+kname+" operation..." else: # TODO: make this not require a kernel config - try: - if not os.path.exists(self.settings["boot/kernel/"+kname+"/config"]): - self.unbind() - raise CatalystError,\ - "Can't find kernel config: "+\ - self.settings["boot/kernel/"+kname+\ - "/config"] - - except TypeError: - raise CatalystError,\ - "Required value boot/kernel/config not specified" - - try: - cmd("cp "+self.settings["boot/kernel/"+kname+\ - "/config"]+" "+\ - self.settings["chroot_path"]+"/var/tmp/"+\ - kname+".config",\ - "Couldn't copy kernel config: "+\ - self.settings["boot/kernel/"+kname+\ - "/config"],env=self.env) - - except CatalystError: - self.unbind() + self._copy_kernel_config(kname=kname) """ If we need to pass special options to the bootloader @@ -1516,6 +1494,31 @@ class generic_stage_target(generic_target): " post-kmerge ", "Runscript post-kmerge failed",env=self.env) + def _copy_kernel_config(self, kname): + try: + if not os.path.exists(self.settings["boot/kernel/"+kname+"/config"]): + self.unbind() + raise CatalystError,\ + "Can't find kernel config: "+\ + self.settings["boot/kernel/"+kname+\ + "/config"] + + except TypeError: + raise CatalystError,\ + "Required value boot/kernel/config not specified" + + try: + cmd("cp "+self.settings["boot/kernel/"+kname+\ + "/config"]+" "+\ + self.settings["chroot_path"]+"/var/tmp/"+\ + kname+".config",\ + "Couldn't copy kernel config: "+\ + self.settings["boot/kernel/"+kname+\ + "/config"],env=self.env) + + except CatalystError: + self.unbind() + def bootloader(self): if "AUTORESUME" in self.settings \ and os.path.exists(self.settings["autoresume_path"]+"bootloader"): -- 1.8.1.336.g94702dd