commit: 61494ce767d3ac1361374b2236e22fe597aa9155
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 4 01:56:56 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> 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"]
