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 14B91138CCF for ; Sun, 24 May 2015 00:08:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E04FE090F; Sun, 24 May 2015 00:08:34 +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 9C5DCE090A for ; Sun, 24 May 2015 00:08:33 +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 9BE4B3409BC for ; Sun, 24 May 2015 00:08:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 604B99F8 for ; Sun, 24 May 2015 00:08:30 +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: <1424991868.f2afd7ff03e6e8453e86be938bd21c2cd33d3996.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: f2afd7ff03e6e8453e86be938bd21c2cd33d3996 X-VCS-Branch: master Date: Sun, 24 May 2015 00:08:30 +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: 380a278b-c90d-4ed6-8c5a-0de460a45c0d X-Archives-Hash: 5fea67e2bad7b64b8f299b1469e5bee9 commit: f2afd7ff03e6e8453e86be938bd21c2cd33d3996 Author: Brian Dolbec gentoo org> AuthorDate: Tue Mar 4 01:56:56 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 23:04:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f2afd7ff Fix purgeonly to remove the chroot directory. catalyst/base/stagebase.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index f2aadee..191baab 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -504,6 +504,9 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_action_sequence(self): """ Default action sequence for run method """ + if "purgeonly" in self.settings["options"]: + self.settings["action_sequence"] = ["remove_chroot"] + return self.settings["action_sequence"]=["unpack","unpack_snapshot",\ "setup_confdir","portage_overlay",\ "base_dirs","bind","chroot_setup","setup_environment",\ @@ -517,6 +520,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: self.settings["action_sequence"].append("remove_autoresume") self.settings["action_sequence"].append("remove_chroot") + return def set_use(self): if self.settings["spec_prefix"]+"/use" in self.settings: @@ -1321,11 +1325,12 @@ class StageBase(TargetBase, ClearBase, GenBase): self.purge() return - if "PURGEONLY" in self.settings: + if "purgeonly" in self.settings["options"]: + print "StageBase: run() purgeonly" self.purge() - return if "purge" in self.settings["options"]: + print "StageBase: run() purge" self.purge() for x in self.settings["action_sequence"]: 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 1704E138CD0 for ; Thu, 21 May 2015 23:53:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EF9FE08C1; Thu, 21 May 2015 23:53:33 +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 DC033E08C1 for ; Thu, 21 May 2015 23:53:32 +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 1895E340FEE for ; Thu, 21 May 2015 23:53:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0116E9EE for ; Thu, 21 May 2015 23:53:30 +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: <1424991868.f2afd7ff03e6e8453e86be938bd21c2cd33d3996.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending 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: f2afd7ff03e6e8453e86be938bd21c2cd33d3996 X-VCS-Branch: pending Date: Thu, 21 May 2015 23:53:30 +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: e2f74e7d-2088-4ab2-8f8d-15e80ad4a67d X-Archives-Hash: cea35258d248b6524b3a8d3d1c61535d Message-ID: <20150521235330.VHNSEvjt-do8bXV1Bx2Ajvb71_-5x3bVhzOSFLPnqzc@z> commit: f2afd7ff03e6e8453e86be938bd21c2cd33d3996 Author: Brian Dolbec gentoo org> AuthorDate: Tue Mar 4 01:56:56 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 23:04:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f2afd7ff Fix purgeonly to remove the chroot directory. catalyst/base/stagebase.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index f2aadee..191baab 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -504,6 +504,9 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_action_sequence(self): """ Default action sequence for run method """ + if "purgeonly" in self.settings["options"]: + self.settings["action_sequence"] = ["remove_chroot"] + return self.settings["action_sequence"]=["unpack","unpack_snapshot",\ "setup_confdir","portage_overlay",\ "base_dirs","bind","chroot_setup","setup_environment",\ @@ -517,6 +520,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: self.settings["action_sequence"].append("remove_autoresume") self.settings["action_sequence"].append("remove_chroot") + return def set_use(self): if self.settings["spec_prefix"]+"/use" in self.settings: @@ -1321,11 +1325,12 @@ class StageBase(TargetBase, ClearBase, GenBase): self.purge() return - if "PURGEONLY" in self.settings: + if "purgeonly" in self.settings["options"]: + print "StageBase: run() purgeonly" self.purge() - return if "purge" in self.settings["options"]: + print "StageBase: run() purge" self.purge() for x in self.settings["action_sequence"]: