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 C51AB1388C1 for ; Sun, 20 Dec 2015 01:13:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2A7BE08B5; Sun, 20 Dec 2015 01:13:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D069E08B5 for ; Sun, 20 Dec 2015 01:13:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE8A3340504 for ; Sun, 20 Dec 2015 01:13:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2B61CB0 for ; Sun, 20 Dec 2015 01:13:01 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1450573905.208ad850b52416b80844a553836bdd76f092692c.dolsen@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: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 208ad850b52416b80844a553836bdd76f092692c X-VCS-Branch: master Date: Sun, 20 Dec 2015 01:13:01 +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: 9e5c4eb9-eaad-4bed-84a8-2c55107ec899 X-Archives-Hash: d7f86d559e0686bbbd1338d65929f35d commit: 208ad850b52416b80844a553836bdd76f092692c Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 20 01:08:29 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Dec 20 01:11:45 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=208ad850 stagebase.py: Fix -P action for stages beyond stage3 Since commit f2afd7ff03e6e8453e86be938bd21c2cd33d3996 it removed the return after calling purge(). Since the remove_chroot operation was separated and that return removed, any target stage that overrode the set_action_sequence no longer did the ful purgeonly step, but continued to add the normal action_sequences for that stage. catalyst/base/stagebase.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a880249..c2902ed 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -160,7 +160,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.set_target_path() self.set_controller_file() - self.set_action_sequence() + self.set_default_action_sequence() self.set_use() self.set_cleanables() self.set_iso_volume_id() @@ -497,11 +497,14 @@ class StageBase(TargetBase, ClearBase, GenBase): else: self.settings["iso_volume_id"]="catalyst "+self.settings["snapshot"] - def set_action_sequence(self): + def set_default_action_sequence(self): """ Default action sequence for run method """ if "purgeonly" in self.settings["options"]: self.settings["action_sequence"] = ["remove_chroot"] return + self.set_action_sequence() + + def set_action_sequence(self): self.settings["action_sequence"]=["unpack","unpack_snapshot",\ "setup_confdir","portage_overlay",\ "base_dirs","bind","chroot_setup","setup_environment",\