[gentoo-commits] proj/catalyst:master commit in: catalyst/targets/

[Matt Turner]

commit:     6b78a58c9ac825ecd450d100cd269d29761dbe03
Author:     Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Thu Feb  4 11:07:18 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 02:05:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6b78a58c

catalyst: Clean up chroot directory on success

The embedded and livecd-stage2 targets override the action sequence
without calling set_completion_action_sequences. This would leave the
temporary build environment unpacked on the filesystem.

Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/embedded.py      | 2 +-
 catalyst/targets/livecd_stage2.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index b677b226..01ad035d 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -53,8 +53,8 @@ class embedded(StageBase):
             self.empty,
             self.clean,
             self.capture,
-            self.clear_autoresume,
         ])
+        self.set_completion_action_sequences()
 
     def set_root_path(self):
         self.settings["root_path"] = normpath("/tmp/mergeroot")

diff --git a/catalyst/targets/livecd_stage2.py 
b/catalyst/targets/livecd_stage2.py
index 774702f8..832e0998 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -108,4 +108,4 @@ class livecd_stage2(StageBase):
                 self.setup_overlay,
                 self.create_iso,
             ])
-        self.finish_sequence.append(self.clear_autoresume)
+        self.set_completion_action_sequences()