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 <gentoo-commits+bounces-377872-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Qz2s1-00037j-3W for garchives@archives.gentoo.org; Thu, 01 Sep 2011 08:43:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C26921C18B; Thu, 1 Sep 2011 08:43:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 69B8721C1E9 for <gentoo-commits@lists.gentoo.org>; Thu, 1 Sep 2011 08:43:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC5D71B4031 for <gentoo-commits@lists.gentoo.org>; Thu, 1 Sep 2011 08:43:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1E27380042 for <gentoo-commits@lists.gentoo.org>; Thu, 1 Sep 2011 08:43:23 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <5e15e5830a915c614cd81f6a87b2e73ac116368d.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: 5e15e5830a915c614cd81f6a87b2e73ac116368d Date: Thu, 1 Sep 2011 08:43:23 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 28e72c46367e6dfb0b9601bbd5f599a5 commit: 5e15e5830a915c614cd81f6a87b2e73ac116368d Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Sep 1 08:43:03 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Sep 1 08:43:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5e15e583 merge: start at correct EPREFIX offset --- 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 0c0ed6a..70816b1 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3872,7 +3872,8 @@ class dblink(object): =20 # we do a first merge; this will recurse through all files in our srcr= oot but also build up a # "second hand" of symlinks to merge later - if self.mergeme(srcroot, destroot, outfile, secondhand, "", cfgfiledic= t, mymtime): + if self.mergeme(srcroot, destroot, outfile, secondhand, + self.settings["EPREFIX"].lstrip(os.sep), cfgfiledict, mymtime): return 1 =20 # now, it's time for dealing our second hand; we'll loop until we can'= t merge anymore. The rest are