From 7c0ba941760c32d123dc225fe797f509195831cb Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 9 Dec 2011 19:55:36 -0800 Subject: Binpkg: handle missing dir after chpathtool --- pym/_emerge/Binpkg.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 57b170f53..49368780c 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -351,11 +351,17 @@ class Binpkg(CompositeTask): # Move the files to the correct location for merge. image_tmp_dir = os.path.join( self.settings["PORTAGE_BUILDDIR"], "image_tmp") - os.rename(os.path.join(self.settings["D"], - self._build_prefix.lstrip(os.sep)), image_tmp_dir) - shutil.rmtree(self._image_dir) - ensure_dirs(os.path.dirname(self.settings["ED"].rstrip(os.sep))) - os.rename(image_tmp_dir, self.settings["ED"]) + build_d = os.path.join(self.settings["D"], + self._build_prefix.lstrip(os.sep)) + if not os.path.isdir(build_d): + # Assume this is a virtual package or something. + shutil.rmtree(self._image_dir) + ensure_dirs(self.settings["ED"]) + else: + os.rename(build_d, image_tmp_dir) + shutil.rmtree(self._image_dir) + ensure_dirs(os.path.dirname(self.settings["ED"].rstrip(os.sep))) + os.rename(image_tmp_dir, self.settings["ED"]) self.wait() -- cgit v1.2.3-1-g7c22