commit: fd1903e5cd80a13d397ae07c6472d08ac6675cba
Author: Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Thu May 21 17:32:46 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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'],
