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 621AF1382C5 for ; Fri, 5 Jun 2020 21:13:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D006E08AB; Fri, 5 Jun 2020 21:13:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 651D7E08AB for ; Fri, 5 Jun 2020 21:13:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6D1F634F2ED for ; Fri, 5 Jun 2020 21:13:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACF53286 for ; Fri, 5 Jun 2020 21:13:51 +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: <1591391316.fd1903e5cd80a13d397ae07c6472d08ac6675cba.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: fd1903e5cd80a13d397ae07c6472d08ac6675cba X-VCS-Branch: master Date: Fri, 5 Jun 2020 21:13:51 +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: 08eb6f0d-e8fe-45e7-b02b-24e9e1c2dee6 X-Archives-Hash: fa82f5bb2d6251e86d988495c3ca26b7 commit: fd1903e5cd80a13d397ae07c6472d08ac6675cba Author: Daniel Cordero 0xdc io> AuthorDate: Thu May 21 17:32:46 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jun 5 21:08:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fd1903e5 embedded: use destpath to clean mergeroot When using remove() with a capture subpath (e.g. the embedded target), specifying files in rm removes the files from the seed stage, not the captured stage. Use destpath as a base for removals. When not using a subpath, destpath equals chroot_path. Also unhardcode log prefix to match the target. Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 5c59c4d2..ab1d409b 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1168,8 +1168,8 @@ class StageBase(TargetBase, ClearBase, GenBase): for x in self.settings[self.settings["spec_prefix"] + "/rm"]: # We're going to shell out for all these cleaning # operations, so we get easy glob handling. - log.notice('livecd: removing %s', x) - clear_path(self.settings["chroot_path"] + x) + log.notice('%s: removing %s', self.settings["spec_prefix"], x) + clear_path(self.settings["destpath"] + x) try: if os.path.exists(self.settings["controller_file"]): cmd([self.settings['controller_file'], 'clean'],