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 1PmtR1-000264-Ra for garchives@archives.gentoo.org; Tue, 08 Feb 2011 19:41:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E17F5E090F; Tue, 8 Feb 2011 19:40:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AFCEAE090F for ; Tue, 8 Feb 2011 19:40:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D3251B4254 for ; Tue, 8 Feb 2011 19:40:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6A7978006A for ; Tue, 8 Feb 2011 19:40:58 +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/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ea5de5801644502ec225e6cf3172af1918cc3554 Date: Tue, 8 Feb 2011 19:40:58 +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: X-Archives-Hash: e9cd74cf8c8c300ad3b279d826036fc8 commit: ea5de5801644502ec225e6cf3172af1918cc3554 Author: Zac Medico gentoo org> AuthorDate: Tue Feb 8 19:39:41 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 8 19:39:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dea5de580 emerge: support ../ path arguments This will fix bug #354141. --- pym/_emerge/depgraph.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index c4d84ab..245e38e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1621,7 +1621,8 @@ class depgraph(object): # Queue these up since it's most efficient to handle # multiple files in a single iter_owners() call. lookup_owners.append(x) - elif x.startswith("." + os.path.sep): + elif x.startswith("." + os.sep) or \ + x.startswith(".." + os.sep): f =3D os.path.abspath(x) if not f.startswith(myroot): portage.writemsg(("\n\n!!! '%s' (resolved from '%s') does not start= with" + \