Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/
Date: Tue, 31 Dec 2013 10:48:44
Message-Id: 1388485271.0b9b7c9e631b29395d40c630d141513e6e897028.dol-sen@gentoo
1 commit: 0b9b7c9e631b29395d40c630d141513e6e897028
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 31 09:07:30 2013 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Tue Dec 31 10:21:11 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0b9b7c9e
7
8 Conditionally add keepwork option to action sequence
9
10 ---
11 catalyst/base/stagebase.py | 8 +++++++-
12 1 file changed, 7 insertions(+), 1 deletion(-)
13
14 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
15 index a196c36..09a29a0 100644
16 --- a/catalyst/base/stagebase.py
17 +++ b/catalyst/base/stagebase.py
18 @@ -501,7 +501,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
19 # "fetch" not in self.settings["options"]:
20 if "fetch" not in self.settings["options"]:
21 self.settings["action_sequence"].append("capture")
22 - self.settings["action_sequence"].append("clear_autoresume")
23 + if "keepwork" in self.settings["options"]:
24 + self.settings["action_sequence"].append("clear_autoresume")
25 + elif "seedcache" in self.settings["options"]:
26 + self.settings["action_sequence"].append("remove_autoresume")
27 + else:
28 + self.settings["action_sequence"].append("remove_autoresume")
29 + self.settings["action_sequence"].append("remove_chroot")
30
31 def set_use(self):
32 if self.settings["spec_prefix"]+"/use" in self.settings: