| 1 |
commit: 2d8c7fe07d7a503faff2712c6f18f5ff0b23a45c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 18 02:49:51 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 18 02:55:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d8c7fe0 |
| 7 |
|
| 8 |
Binpkg: fix _chpathtool_exit rmtree ENOENT after rename |
| 9 |
|
| 10 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 11 |
|
| 12 |
lib/_emerge/Binpkg.py | 5 +++-- |
| 13 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/lib/_emerge/Binpkg.py b/lib/_emerge/Binpkg.py |
| 16 |
index 542ef8fb0..f9cffa26d 100644 |
| 17 |
--- a/lib/_emerge/Binpkg.py |
| 18 |
+++ b/lib/_emerge/Binpkg.py |
| 19 |
@@ -378,14 +378,15 @@ class Binpkg(CompositeTask): |
| 20 |
image_tmp_dir = os.path.join( |
| 21 |
self.settings["PORTAGE_BUILDDIR"], "image_tmp") |
| 22 |
build_d = os.path.join(self.settings["D"], |
| 23 |
- self._build_prefix.lstrip(os.sep)) |
| 24 |
+ self._build_prefix.lstrip(os.sep)).rstrip(os.sep) |
| 25 |
if not os.path.isdir(build_d): |
| 26 |
# Assume this is a virtual package or something. |
| 27 |
shutil.rmtree(self._image_dir) |
| 28 |
ensure_dirs(self.settings["ED"]) |
| 29 |
else: |
| 30 |
os.rename(build_d, image_tmp_dir) |
| 31 |
- shutil.rmtree(self._image_dir) |
| 32 |
+ if build_d != self._image_dir: |
| 33 |
+ shutil.rmtree(self._image_dir) |
| 34 |
ensure_dirs(os.path.dirname(self.settings["ED"].rstrip(os.sep))) |
| 35 |
os.rename(image_tmp_dir, self.settings["ED"]) |
Archives