aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-03-03 17:56:56 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-02-26 15:04:28 -0800
commitf2afd7ff03e6e8453e86be938bd21c2cd33d3996 (patch)
tree05bd4d991e8c9391bf6e579881458646767079d9
parentcatalyst/base/clearbase.py: Fix remove parameter mistakes. (diff)
downloadcatalyst-f2afd7ff03e6e8453e86be938bd21c2cd33d3996.tar.gz
catalyst-f2afd7ff03e6e8453e86be938bd21c2cd33d3996.tar.bz2
catalyst-f2afd7ff03e6e8453e86be938bd21c2cd33d3996.zip
Fix purgeonly to remove the chroot directory.
-rw-r--r--catalyst/base/stagebase.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f2aadee9..191baab5 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"]: