From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89CF013835A for ; Thu, 10 Jun 2021 00:48:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCFC5E08FB; Thu, 10 Jun 2021 00:48:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7BC9E08FB for ; Thu, 10 Jun 2021 00:48:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4133335D74 for ; Thu, 10 Jun 2021 00:48:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 189027AA for ; Thu, 10 Jun 2021 00:48:43 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1613873134.6b78a58c9ac825ecd450d100cd269d29761dbe03.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/embedded.py catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6b78a58c9ac825ecd450d100cd269d29761dbe03 X-VCS-Branch: wip/mattst88 Date: Thu, 10 Jun 2021 00:48:43 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 819054be-7b12-47c1-ad56-fe63a7faa222 X-Archives-Hash: 9dfcb8bd5d728647b418ee6806c6d736 Message-ID: <20210610004843.0jbsuGi5jbZWOQTvGpk5sT4Nd7f4QLBxqpByBkMOEPY@z> commit: 6b78a58c9ac825ecd450d100cd269d29761dbe03 Author: Daniel Cordero 0xdc io> AuthorDate: Thu Feb 4 11:07:18 2021 +0000 Commit: Matt Turner gentoo 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 0xdc.io> Signed-off-by: Matt Turner 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()