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 1F6681382C5 for ; Sun, 21 Feb 2021 02:04:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AAFDE0866; Sun, 21 Feb 2021 02:04:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1C3C2E0866 for ; Sun, 21 Feb 2021 02:04:24 +0000 (UTC) Received: by mail-ed1-f44.google.com with SMTP id j9so17362366edp.1 for ; Sat, 20 Feb 2021 18:04:22 -0800 (PST) X-Gm-Message-State: AOAM530+o12HbrNGs8t0NWdqWjHD8DeHQdouFhOZGvHhSLr8nARwU/lk uL1yzVhpbjGfB+0FMNeQGNPSaKkg9ojX9GgNDMA= X-Google-Smtp-Source: ABdhPJyPtcCPVN/acZd/whPtL9acv5YB6wUEq4FyGpDo8o4HFaDsO1aD+/yMvOZAYaVMBb+lhxJHlWdHZoF3+afh8o8= X-Received: by 2002:a05:6402:151:: with SMTP id s17mr15475717edu.107.1613873059894; Sat, 20 Feb 2021 18:04:19 -0800 (PST) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 References: <20210204110721.33846-1-gentoo.catalyst@xxoo.ws> In-Reply-To: <20210204110721.33846-1-gentoo.catalyst@xxoo.ws> From: Matt Turner Date: Sat, 20 Feb 2021 21:04:07 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [gentoo-catalyst] [PATCH] Clean up chroot directory on success To: gentoo-catalyst@lists.gentoo.org Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: 9d7ea480-1155-461b-8356-25623cd970d5 X-Archives-Hash: 8baaba2d873a6ff38a0e71d09c6cc25f On Thu, Feb 4, 2021 at 6:08 AM Daniel Cordero wrote: > > From: Daniel Cordero > > 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. Thanks. Seems like a good idea. I had to rebase this, because about 10 days before this patch was sent I changed the sequences to be self.function rather than "function" in commit 440a379ae94e (catalyst: Store references to functions). Please try to rebase your patches onto master in the future. > Signed-off-by: Daniel Cordero > --- > 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 918b36bf..102b5edd 100644 > --- a/catalyst/targets/embedded.py > +++ b/catalyst/targets/embedded.py > @@ -62,8 +62,8 @@ class embedded(StageBase): > "empty", > "clean", > "capture", I think we need to also remove capture here, since set_completion_action_sequences() begins with if "fetch" not in self.settings["options"]: self.finish_sequence.append(self.capture) I'll make that change locally when I commit this. > - "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 3606047f..b8bb56a2 100644 > --- a/catalyst/targets/livecd_stage2.py > +++ b/catalyst/targets/livecd_stage2.py > @@ -117,4 +117,4 @@ class livecd_stage2(StageBase): > "setup_overlay", > "create_iso", > ]) > - self.finish_sequence.append("clear_autoresume") > + self.set_completion_action_sequences() > -- > 2.26.2 > >