From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 10 Dec 2011 03:31:20 +0000 (-0800)
Subject: Binpkg: fix os.path.dirname() usage
X-Git-Tag: v2.2.0_alpha80~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4b19ee8e8f7039d146ed85af2f264cf9b93dae1;p=portage.git

Binpkg: fix os.path.dirname() usage

It doesn't behave as intended for $ED which has a trailing slash.
---

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 5a58ad288..57b170f53 100644
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -354,7 +354,7 @@ class Binpkg(CompositeTask):
 		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"]))
+		ensure_dirs(os.path.dirname(self.settings["ED"].rstrip(os.sep)))
 		os.rename(image_tmp_dir, self.settings["ED"])
 
 		self.wait()