From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8B6D13835A for ; Mon, 18 Jan 2021 18:24:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1862E0788; Mon, 18 Jan 2021 18:24:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C755BE0788 for ; Mon, 18 Jan 2021 18:24:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6299A34100D for ; Mon, 18 Jan 2021 18:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C2FB4A1 for ; Mon, 18 Jan 2021 18:24:06 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1610992881.9ad4ff837c440d92af2c35d1fe085b0fb6250e2d.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/embedded.py catalyst/targets/livecd_stage1.py catalyst/targets/livecd_stage2.py catalyst/targets/netboot.py catalyst/targets/stage4.py X-VCS-Directories: catalyst/base/ catalyst/targets/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9ad4ff837c440d92af2c35d1fe085b0fb6250e2d X-VCS-Branch: wip/mattst88 Date: Mon, 18 Jan 2021 18:24:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a205cabe-6707-4ec4-af96-06a751c58498 X-Archives-Hash: f6245b95750324130f2a3179e3dffc07 commit: 9ad4ff837c440d92af2c35d1fe085b0fb6250e2d Author: Matt Turner gentoo org> AuthorDate: Mon Jan 18 03:15:02 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jan 18 18:01:21 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9ad4ff83 catalyst: Deduplicate prepare_sequence assignments Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 13 ++++++------- catalyst/targets/embedded.py | 6 ------ catalyst/targets/livecd_stage1.py | 6 ------ catalyst/targets/livecd_stage2.py | 6 ------ catalyst/targets/netboot.py | 6 ------ catalyst/targets/stage4.py | 6 ------ 6 files changed, 6 insertions(+), 37 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 9d72e765..8107ee7a 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -84,7 +84,12 @@ class StageBase(TargetBase, ClearBase, GenBase): "portage_overlay", "portage_prefix", ]) - self.prepare_sequence = [] + self.prepare_sequence = [ + self.unpack, + self.config_profile_link, + self.setup_confdir, + self.portage_overlay, + ] self.build_sequence = [] self.finish_sequence = [] @@ -498,12 +503,6 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_action_sequence(self): """Set basic stage1, 2, 3 action sequences""" - self.prepare_sequence.extend([ - self.unpack, - self.config_profile_link, - self.setup_confdir, - self.portage_overlay, - ]) self.build_sequence.extend([ self.bind, self.chroot_setup, diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index 7d328808..83b17ad2 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -41,12 +41,6 @@ class embedded(StageBase): StageBase.__init__(self, spec, addlargs) def set_action_sequence(self): - self.prepare_sequence.extend([ - self.unpack, - self.config_profile_link, - self.setup_confdir, - self.portage_overlay, - ]) self.build_sequence.extend([ self.bind, self.chroot_setup, diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py index eb6bb0f0..9fe95a00 100644 --- a/catalyst/targets/livecd_stage1.py +++ b/catalyst/targets/livecd_stage1.py @@ -23,12 +23,6 @@ class livecd_stage1(StageBase): StageBase.__init__(self, spec, addlargs) def set_action_sequence(self): - self.prepare_sequence.extend([ - self.unpack, - self.config_profile_link, - self.setup_confdir, - self.portage_overlay, - ]) self.build_sequence.extend([ self.bind, self.chroot_setup, diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 5fecff85..ab8f4a0e 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -86,12 +86,6 @@ class livecd_stage2(StageBase): print_traceback=True) def set_action_sequence(self): - self.prepare_sequence.extend([ - self.unpack, - self.config_profile_link, - self.setup_confdir, - self.portage_overlay, - ]) self.build_sequence.extend([ self.bind, self.chroot_setup, diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py index 9a7e59e5..cb5e7ae4 100644 --- a/catalyst/targets/netboot.py +++ b/catalyst/targets/netboot.py @@ -158,12 +158,6 @@ class netboot(StageBase): self.resume.enable("empty") def set_action_sequence(self): - self.prepare_sequence.extend([ - self.unpack, - self.config_profile_link, - self.setup_confdir, - self.portage_overlay, - ]) self.build_sequence.extend([ self.bind, self.chroot_setup, diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py index 997139a5..9e53f070 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -39,12 +39,6 @@ class stage4(StageBase): self.settings["cleanables"].remove('/etc/resolv.conf') def set_action_sequence(self): - self.prepare_sequence.extend([ - self.unpack, - self.config_profile_link, - self.setup_confdir, - self.portage_overlay, - ]) self.build_sequence.extend([ self.bind, self.chroot_setup,