From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RZDf3-0001jT-7r for garchives@archives.gentoo.org; Sat, 10 Dec 2011 03:31:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9515221C068; Sat, 10 Dec 2011 03:31:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5FEF121C068 for ; Sat, 10 Dec 2011 03:31:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB4631B4006 for ; Sat, 10 Dec 2011 03:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0BDC080042 for ; Sat, 10 Dec 2011 03:31:31 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Binpkg.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d4b19ee8e8f7039d146ed85af2f264cf9b93dae1 Date: Sat, 10 Dec 2011 03:31:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 61f40070-1552-43b3-b929-492ceaf050c6 X-Archives-Hash: c10f6eb5c15250003f555d5237e62a4e commit: d4b19ee8e8f7039d146ed85af2f264cf9b93dae1 Author: Zac Medico gentoo org> AuthorDate: Sat Dec 10 03:31:20 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 10 03:31:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd4b19ee8 Binpkg: fix os.path.dirname() usage It doesn't behave as intended for $ED which has a trailing slash. --- pym/_emerge/Binpkg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 5a58ad2..57b170f 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"]) =20 self.wait()