From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7A400198005 for ; Sat, 16 Mar 2013 01:46:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59F4CE0678; Sat, 16 Mar 2013 01:46:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8C31E0678 for ; Sat, 16 Mar 2013 01:46:22 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0949B33DB27 for ; Sat, 16 Mar 2013 01:46:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8E6EFE4079 for ; Sat, 16 Mar 2013 01:46:20 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1363398367.e6971d5000178a2ab84e0a3217f0b5b031d491ef.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e6971d5000178a2ab84e0a3217f0b5b031d491ef X-VCS-Branch: master Date: Sat, 16 Mar 2013 01:46:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 00d94746-a689-4c5b-9db1-551535fe4ef3 X-Archives-Hash: 66206a5c4c3d88c352920a8ff3d15b7e commit: e6971d5000178a2ab84e0a3217f0b5b031d491ef Author: Zac Medico gentoo org> AuthorDate: Sat Mar 16 01:46:07 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 16 01:46:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e6971d50 mergeme: fix myrealto join with lstrip(os.sep) --- pym/portage/dbapi/vartree.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f918c2c..971ab7a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4434,7 +4434,8 @@ class dblink(object): myto = myto[len(self.settings["D"])-1:] # myrealto contains the path of the real file to which this symlink points. # we can simply test for existence of this file to see if the target has been merged yet - myrealto = normalize_path(os.path.join(destroot, myabsto)) + myrealto = normalize_path(os.path.join(destroot, + myabsto.lstrip(os.sep))) if mydmode!=None: #destination exists if stat.S_ISDIR(mydmode):