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 1BF171387B1 for ; Wed, 22 Jan 2014 05:04:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29D50E116C; Wed, 22 Jan 2014 05:04:15 +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 564C7E1166 for ; Wed, 22 Jan 2014 05:04:14 +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 86D4533FAED for ; Wed, 22 Jan 2014 05:04:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9C94B187BC for ; Wed, 22 Jan 2014 05:04:11 +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: <1388772141.19a9430dbec3c3d5b380e8c6309ba41241ef9fdc.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: 19a9430dbec3c3d5b380e8c6309ba41241ef9fdc X-VCS-Branch: 3.0 Date: Wed, 22 Jan 2014 05:04:11 +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: 29273c20-6af4-4667-abaa-797d337bb02a X-Archives-Hash: b53b6ff5664a7ebf0849b52ae8e6d995 commit: 19a9430dbec3c3d5b380e8c6309ba41241ef9fdc Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 31 09:07:30 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Jan 3 18:02:21 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=19a9430d Conditionally add keepwork option to action sequence --- catalyst/base/stagebase.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a196c36..09a29a0 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -501,7 +501,13 @@ class StageBase(TargetBase, ClearBase, GenBase): # "fetch" not in self.settings["options"]: if "fetch" not in self.settings["options"]: self.settings["action_sequence"].append("capture") - self.settings["action_sequence"].append("clear_autoresume") + if "keepwork" in self.settings["options"]: + self.settings["action_sequence"].append("clear_autoresume") + elif "seedcache" in self.settings["options"]: + self.settings["action_sequence"].append("remove_autoresume") + else: + self.settings["action_sequence"].append("remove_autoresume") + self.settings["action_sequence"].append("remove_chroot") def set_use(self): if self.settings["spec_prefix"]+"/use" in self.settings: