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 1RJunF-00064e-3p for garchives@archives.gentoo.org; Fri, 28 Oct 2011 22:20:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFB4E21C01F; Fri, 28 Oct 2011 22:20:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7176421C01F for ; Fri, 28 Oct 2011 22:20:45 +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 E065E1B4002 for ; Fri, 28 Oct 2011 22:20:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4E21E80042 for ; Fri, 28 Oct 2011 22:20:44 +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: <967bc855b7e4db529afbe8b7bf7f8ed7ea55858a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/emerge/, pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/emerge/test_simple.py pym/portage/tests/resolver/ResolverPlayground.py X-VCS-Directories: pym/portage/tests/emerge/ pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 967bc855b7e4db529afbe8b7bf7f8ed7ea55858a Date: Fri, 28 Oct 2011 22:20:44 +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: 5aba9a7f33cca9d70eef68c10c81d348 commit: 967bc855b7e4db529afbe8b7bf7f8ed7ea55858a Author: Zac Medico gentoo org> AuthorDate: Fri Oct 28 22:20:35 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 28 22:20:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D967bc855 ResolverPlayground: remove unused root attribute --- pym/portage/tests/emerge/test_simple.py | 1 - pym/portage/tests/resolver/ResolverPlayground.py | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/= emerge/test_simple.py index 4110b55..7ed679d 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -138,7 +138,6 @@ pkg_info() { eprefix =3D settings["EPREFIX"] eroot =3D settings["EROOT"] trees =3D playground.trees - root =3D playground.root portdb =3D trees[eroot]["porttree"].dbapi portdir =3D settings["PORTDIR"] var_cache_edb =3D os.path.join(eprefix, "var", "cache", "edb") diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/porta= ge/tests/resolver/ResolverPlayground.py index 57cdebe..1a752be 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -17,7 +17,7 @@ from portage.package.ebuild.config import config from portage.package.ebuild.digestgen import digestgen from portage._sets import load_default_config from portage._sets.base import InternalPackageSet -from portage.util import ensure_dirs +from portage.util import ensure_dirs, normalize_path from portage.versions import catsplit =20 import _emerge @@ -65,9 +65,8 @@ class ResolverPlayground(object): profile: settings defined by the profile. """ self.debug =3D debug - self.root =3D "/" - self.eprefix =3D tempfile.mkdtemp() - self.eroot =3D self.root + self.eprefix.lstrip(os.sep) + os.sep + self.eprefix =3D normalize_path(tempfile.mkdtemp()) + self.eroot =3D self.eprefix + os.sep self.distdir =3D os.path.join(self.eroot, "var", "portage", "distfiles= ") self.portdir =3D os.path.join(self.eroot, "usr/portage") self.vdbdir =3D os.path.join(self.eroot, "var/db/pkg")