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 1QxvBj-0001SJ-MC for garchives@archives.gentoo.org; Mon, 29 Aug 2011 06:19:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 250E221C208; Mon, 29 Aug 2011 06:19:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E5D6B21C208 for ; Mon, 29 Aug 2011 06:19:07 +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 5E5BD1B40C9 for ; Mon, 29 Aug 2011 06:19:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B9EFF80040 for ; Mon, 29 Aug 2011 06:19:06 +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/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/ResolverPlayground.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: acad62063c074f5b4ff692bc52514b1b8d028100 Date: Mon, 29 Aug 2011 06:19:06 +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: 51df51162e54cac9915add64b7c5f3c5 commit: acad62063c074f5b4ff692bc52514b1b8d028100 Author: Zac Medico gentoo org> AuthorDate: Mon Aug 29 06:18:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Aug 29 06:18:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dacad6206 ResolverPlayground: fix to make emerge happy --- pym/portage/tests/resolver/ResolverPlayground.py | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/porta= ge/tests/resolver/ResolverPlayground.py index dd01414..f41126b 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -7,7 +7,7 @@ import sys import tempfile import portage from portage import os -from portage.const import PORTAGE_BASE_PATH +from portage.const import GLOBAL_CONFIG_PATH, PORTAGE_BASE_PATH from portage.dbapi.vartree import vartree from portage.dbapi.porttree import portagetree from portage.dbapi.bintree import binarytree @@ -16,6 +16,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.versions import catsplit =20 import _emerge @@ -206,6 +207,7 @@ class ResolverPlayground(object): f.close() =09 write_key("EAPI", eapi) + write_key("COUNTER", "0") write_key("LICENSE", lic) write_key("PROPERTIES", properties) write_key("SLOT", slot) @@ -286,6 +288,11 @@ class ResolverPlayground(object): f.write("x86\n") f.close() =20 + parent_file =3D os.path.join(sub_profile_dir, "parent") + f =3D open(parent_file, "w") + f.write("..\n") + f.close() + if profile: for config_file, lines in profile.items(): if config_file not in self.config_files: @@ -331,6 +338,13 @@ class ResolverPlayground(object): f.write("%s\n" % line) f.close() =20 + #Create /usr/share/portage/config/make.globals + make_globals_path =3D os.path.join(self.eroot, + GLOBAL_CONFIG_PATH.lstrip(os.sep), "make.globals") + ensure_dirs(os.path.dirname(make_globals_path)) + os.symlink(os.path.join(PORTAGE_BASE_PATH, "cnf", "make.globals"), + make_globals_path) + #Create /usr/share/portage/config/sets/portage.conf default_sets_conf_dir =3D os.path.join(self.eroot, "usr/share/portage/= config/sets") =09