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 8E4DC1382C5 for ; Mon, 18 Jan 2021 20:22:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCAADE0844; Mon, 18 Jan 2021 20:22:13 +0000 (UTC) Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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 D6EACE0844 for ; Mon, 18 Jan 2021 20:22:13 +0000 (UTC) Received: by mail-qk1-f173.google.com with SMTP id f26so19869665qka.0 for ; Mon, 18 Jan 2021 12:22:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UJyJpO2C0May3vJlboa3H8dRXS1Wv+WZYLOVETVcz4o=; b=O8B4EYgLP9nPsj1WhYyWfoAavPZeWNiUxXMmsQlXUe+I1ePM2QMTqTdkBwE2+tx0m7 We9JN7i8Wfdh40kZdNbMRVsVQojGGEaf6zuk5tPuY3JWjlEdh3r32C3NLoHRD9bZ/0xx g35lQyXjTYN31LqQbl1EWCojUOZHB2l/7CyR0KD68YoEH1Yj5Xcy5BHSHHSe4OzdWlxQ wGjmteykasPljgKSMBWNPBH1i4OAYvyEV9d+mXrPkhtxK5Ve67IruN4YASwxZHfTAUMk gQbjtwhMoU08lKqjCN7J5P5XGJAFVqVqJtfgIdjBRhFWvt6PcqDnyUjih1x/7HZ5Rtd4 LPyg== X-Gm-Message-State: AOAM532ktPYCeDzW3C55JPfcN5c5F3k361cb1lSa0avPa/oKjSlZoO68 f4dEdEIT0vcvcTypik64cwtUYiaPt3E= X-Google-Smtp-Source: ABdhPJzAgSOgK4BULg7IsNIPuveUmnXp45gp/5lqP1zzze9OZfpr8iE1Al9gyDk/efUNrNV9P/92CQ== X-Received: by 2002:a37:6c1:: with SMTP id 184mr1256339qkg.381.1611001332607; Mon, 18 Jan 2021 12:22:12 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id y17sm11264135qki.48.2021.01.18.12.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 12:22:11 -0800 (PST) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 08/11] catalyst: Deduplicate prepare_sequence assignments Date: Mon, 18 Jan 2021 15:21:49 -0500 Message-Id: <20210118202152.374078-8-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210118202152.374078-1-mattst88@gentoo.org> References: <20210118202152.374078-1-mattst88@gentoo.org> 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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 46b130b8-58fe-4437-b0e2-c874f1c51560 X-Archives-Hash: 2772d44afde22172a06b6f802759152b Signed-off-by: Matt Turner --- 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 53b0a224..3b8d3a6e 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, -- 2.26.2