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 ECF1A59CA5 for ; Mon, 21 Mar 2016 04:55:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51964E0825; Mon, 21 Mar 2016 04:55:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFBDCE0825 for ; Mon, 21 Mar 2016 04:55:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30FB2340906 for ; Mon, 21 Mar 2016 04:55:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3485853 for ; Mon, 21 Mar 2016 04:55:32 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1458536075.ff4449cbfc251707c573ec9e430dd04bdaa1424a.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: ff4449cbfc251707c573ec9e430dd04bdaa1424a X-VCS-Branch: master Date: Mon, 21 Mar 2016 04:55:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5f173283-5936-4be5-a48a-4beac2c3d1ab X-Archives-Hash: 1d87d444296c0c895baca98d32665886 commit: ff4449cbfc251707c573ec9e430dd04bdaa1424a Author: Mike Frysinger gentoo org> AuthorDate: Mon Mar 21 04:54:35 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Mar 21 04:54:35 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ff4449cb stagebase: clean up some redundant key lookups A bunch of places copy & paste the key used to index dicts. Use a variable instead to simplify the code a bit. catalyst/base/stagebase.py | 62 ++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index eeaea6c..98c4959 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1565,24 +1565,19 @@ class StageBase(TargetBase, ClearBase, GenBase): # If we need to pass special options to the bootloader # for this kernel put them into the environment - if "boot/kernel/"+kname+"/kernelopts" in self.settings: - myopts=self.settings["boot/kernel/"+kname+\ - "/kernelopts"] + key = 'boot/kernel/' + kname + '/kernelopts' + if key in self.settings: + myopts = self.settings[key] if not isinstance(myopts, str): myopts = ' '.join(myopts) self.env[kname+"_kernelopts"]=myopts - else: self.env[kname+"_kernelopts"]="" - if "boot/kernel/"+kname+"/extraversion" not in self.settings: - self.settings["boot/kernel/"+kname+\ - "/extraversion"]="" - - self.env["clst_kextraversion"]=\ - self.settings["boot/kernel/"+kname+\ - "/extraversion"] + key = 'boot/kernel/' + kname + '/extraversion' + self.settings.setdefault(key, '') + self.env["clst_kextraversion"] = self.settings[key] self._copy_initramfs_overlay(kname=kname) @@ -1606,44 +1601,35 @@ class StageBase(TargetBase, ClearBase, GenBase): "Runscript post-kmerge failed",env=self.env) def _copy_kernel_config(self, kname): - if "boot/kernel/"+kname+"/config" in self.settings: - if not os.path.exists(self.settings["boot/kernel/"+kname+"/config"]): + key = 'boot/kernel/' + kname + '/config' + if key in self.settings: + if not os.path.exists(self.settings[key]): self.unbind() - raise CatalystError( - "Can't find kernel config: "+\ - self.settings["boot/kernel/"+kname+\ - "/config"]) + raise CatalystError("Can't find kernel config: %s" % + self.settings[key]) 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) + cmd('cp ' + self.settings[key] + ' ' + + self.settings['chroot_path'] + '/var/tmp/' + kname + '.config', + "Couldn't copy kernel config: %s" % self.settings[key], + env=self.env) except CatalystError: self.unbind() def _copy_initramfs_overlay(self, kname): - if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: - if os.path.exists(self.settings["boot/kernel/"+\ - kname+"/initramfs_overlay"]): - log.notice('Copying initramfs_overlay dir %s', - self.settings['boot/kernel/' + kname + '/initramfs_overlay']) + key = 'boot/kernel/' + kname + '/initramfs_overlay' + if key in self.settings: + if os.path.exists(self.settings[key]): + log.notice('Copying initramfs_overlay dir %s', self.settings[key]) ensure_dirs( self.settings['chroot_path'] + - '/tmp/initramfs_overlay/' + - self.settings['boot/kernel/'+kname+'/initramfs_overlay']) - - cmd("cp -R "+self.settings["boot/kernel/"+\ - kname+"/initramfs_overlay"]+"/* "+\ - self.settings["chroot_path"]+\ - "/tmp/initramfs_overlay/"+\ - self.settings["boot/kernel/"+kname+\ - "/initramfs_overlay"],env=self.env) + '/tmp/initramfs_overlay/' + self.settings[key]) + + cmd('cp -R ' + self.settings[key] + '/* ' + + self.settings['chroot_path'] + + '/tmp/initramfs_overlay/' + self.settings[key], env=self.env) def bootloader(self): if "autoresume" in self.settings["options"] \