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 66AB1138A1F for ; Fri, 18 Apr 2014 16:52:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89A1DE0B3F; Fri, 18 Apr 2014 16:52:31 +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 678B9E0B12 for ; Fri, 18 Apr 2014 16:52:29 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7FBD33403A5 for ; Fri, 18 Apr 2014 16:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 69278186A2 for ; Fri, 18 Apr 2014 16:52:26 +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: <1397839837.61494ce767d3ac1361374b2236e22fe597aa9155.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 61494ce767d3ac1361374b2236e22fe597aa9155 X-VCS-Branch: 3.0 Date: Fri, 18 Apr 2014 16:52:26 +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: 44c2ae66-6183-4587-b1af-fbbd5b5bd5b1 X-Archives-Hash: ce1df2f55afcbd2d013c516ce557ba18 commit: 61494ce767d3ac1361374b2236e22fe597aa9155 Author: Brian Dolbec gentoo org> AuthorDate: Tue Mar 4 01:56:56 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Apr 18 16:50:37 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=61494ce7 Fix purgeonly to remove the chroot directory. --- catalyst/base/stagebase.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 38bfbe7..cb8d4d6 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -501,6 +501,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",\ @@ -514,6 +517,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: @@ -1329,12 +1333,11 @@ class StageBase(TargetBase, ClearBase, GenBase): return if "purgeonly" in self.settings["options"]: - #print "StageBase: run() purgeonly" + print "StageBase: run() purgeonly" self.purge() - return if "purge" in self.settings["options"]: - #print "StageBase: run() purge" + print "StageBase: run() purge" self.purge() #print "--- Running action sequences:", self.settings["action_sequence"]