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 1RWXSv-0002o7-42 for garchives@archives.gentoo.org; Fri, 02 Dec 2011 18:04:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AB9921C03D; Fri, 2 Dec 2011 18:03:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DC9B721C03D for ; Fri, 2 Dec 2011 18:03:46 +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 547581B4019 for ; Fri, 2 Dec 2011 18:03:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CBACF80044 for ; Fri, 2 Dec 2011 18:03:45 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: f5b5a26b7d729a93b784de29e438ad76b3e7c433 Date: Fri, 2 Dec 2011 18:03:45 +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: 8529a016-e9d6-4d0b-86a1-9729257e65a4 X-Archives-Hash: 7c6311318cc9baf2ea3b5e316fa5c8c1 commit: f5b5a26b7d729a93b784de29e438ad76b3e7c433 Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 2 18:02:26 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 2 18:02:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df5b5a26b Merge commit 'v2.2.0_alpha72' into prefix Conflicts: bin/lock-helper.py bin/xpak-helper.py pym/_emerge/actions.py pym/portage/__init__.py bin/ebuild | 4 +- bin/egencache | 87 ++++-- bin/emaint | 22 +- bin/glsa-check | 5 +- bin/lock-helper.py | 4 +- bin/portageq | 81 +++-- bin/quickpkg | 24 +- bin/regenworld | 5 +- bin/repoman | 11 +- bin/xpak-helper.py | 4 +- man/emerge.1 | 4 + man/make.conf.5 | 9 +- man/portage.5 | 12 +- man/repoman.1 | 5 +- pym/_emerge/BlockerDB.py | 5 +- pym/_emerge/EbuildFetchonly.py | 4 +- pym/_emerge/EbuildMetadataPhase.py | 6 +- pym/_emerge/FakeVartree.py | 11 +- pym/_emerge/Package.py | 8 +- pym/_emerge/RootConfig.py | 2 +- pym/_emerge/Scheduler.py | 17 +- pym/_emerge/actions.py | 304 +++++++-------= --- pym/_emerge/depgraph.py | 33 +- pym/_emerge/main.py | 49 ++- pym/_emerge/unmerge.py | 4 +- pym/portage/__init__.py | 42 ++- pym/portage/_global_updates.py | 2 +- pym/portage/_legacy_globals.py | 12 +- pym/portage/_sets/__init__.py | 38 ++- pym/portage/cache/metadata.py | 1 - pym/portage/cache/template.py | 5 + pym/portage/checksum.py | 41 ++- pym/portage/dbapi/_expand_new_virt.py | 3 +- pym/portage/dbapi/bintree.py | 35 ++- pym/portage/dbapi/porttree.py | 43 ++- pym/portage/dbapi/vartree.py | 110 +++++-- pym/portage/dep/dep_check.py | 8 +- pym/portage/elog/mod_syslog.py | 2 +- pym/portage/news.py | 74 ++++- .../package/ebuild/_config/KeywordsManager.py | 6 +- .../package/ebuild/_config/LocationsManager.py | 83 ++++- pym/portage/package/ebuild/_config/MaskManager.py | 37 ++- pym/portage/package/ebuild/_config/UseManager.py | 18 +- pym/portage/package/ebuild/config.py | 96 +++--- pym/portage/package/ebuild/digestcheck.py | 2 +- pym/portage/package/ebuild/doebuild.py | 25 +- pym/portage/repository/config.py | 358 +++++++++++++-= ------ pym/portage/tests/ebuild/test_config.py | 8 +- pym/portage/tests/ebuild/test_doebuild_spawn.py | 2 +- pym/portage/tests/emerge/test_global_updates.py | 39 +++ pym/portage/tests/emerge/test_simple.py | 39 ++- pym/portage/tests/repoman/test_simple.py | 2 +- pym/portage/tests/resolver/ResolverPlayground.py | 27 +- pym/portage/update.py | 5 + pym/portage/util/__init__.py | 11 +- pym/portage/util/env_update.py | 13 +- pym/repoman/utilities.py | 4 + runtests.sh | 20 ++ 58 files changed, 1253 insertions(+), 678 deletions(-) diff --cc bin/lock-helper.py index 886b52d,065ddcb..23db096 --- a/bin/lock-helper.py +++ b/bin/lock-helper.py @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010 Gentoo Foundation + # Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import os diff --cc bin/xpak-helper.py index 4d096cc,ef74920..1d57069 --- a/bin/xpak-helper.py +++ b/bin/xpak-helper.py @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2009 Gentoo Foundation + # Copyright 2009-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import optparse diff --cc pym/_emerge/actions.py index 46d68b8,af3780e..7e032d1 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@@ -25,7 -30,7 +30,7 @@@ from portage import o from portage import subprocess_getstatusoutput from portage import _unicode_decode from portage.cache.cache_errors import CacheError - from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH, EPREFIX -from portage.const import GLOBAL_CONFIG_PATH ++from portage.const import GLOBAL_CONFIG_PATH, EPREFIX from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_SET_CONFIG from portage.dbapi.dep_expand import dep_expand from portage.dbapi._expand_new_virt import expand_new_virt diff --cc pym/portage/__init__.py index 3de273f,27353a1..c5b7f76 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@@ -491,15 -495,25 +496,27 @@@ def create_trees(config_root=3DNone, targ portdbapi.portdbapi_instances.remove(portdb) del trees[myroot]["porttree"], myroot, portdb =20 - eprefix =3D os.environ.get("__PORTAGE_TEST_EPREFIX") + if trees is None: + trees =3D _trees_dict() + elif not isinstance(trees, _trees_dict): + # caller passed a normal dict or something, + # but we need a _trees_dict instance + trees =3D _trees_dict(trees) +=20 + if env is None: + env =3D os.environ + eprefix =3D env.get("__PORTAGE_TEST_EPREFIX") + if not eprefix: + eprefix =3D EPREFIX settings =3D config(config_root=3Dconfig_root, target_root=3Dtarget_ro= ot, - config_incrementals=3Dportage.const.INCREMENTALS, _eprefix=3Deprefix) + env=3Denv, _eprefix=3Deprefix) settings.lock() =20 - myroots =3D [(settings["ROOT"], settings)] - if settings["ROOT"] !=3D "/": + trees._target_eroot =3D settings['EROOT'] + myroots =3D [(settings['EROOT'], settings)] + if settings["ROOT"] =3D=3D "/": + trees._running_eroot =3D trees._target_eroot + else: =20 # When ROOT !=3D "/" we only want overrides from the calling # environment to apply to the config that's associated diff --cc pym/portage/dbapi/vartree.py index f333494,73772b0..d189775 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@@ -29,11 -29,9 +29,12 @@@ portage.proxy.lazyimport.lazyimport(glo 'portage.util.listdir:dircache,listdir', 'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry', 'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap', + 'portage.util._dyn_libs.LinkageMapMachO:LinkageMapMachO', + 'portage.util._dyn_libs.LinkageMapPeCoff:LinkageMapPeCoff', + 'portage.util._dyn_libs.LinkageMapXCoff:LinkageMapXCoff', 'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,pkgcmp,' + \ '_pkgsplit@pkgsplit', + 'tarfile', ) =20 from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, \ diff --cc pym/portage/package/ebuild/_config/MaskManager.py index 89c06fd,bce1152..7d44e79 --- a/pym/portage/package/ebuild/_config/MaskManager.py +++ b/pym/portage/package/ebuild/_config/MaskManager.py @@@ -102,22 -116,16 +116,27 @@@ class MaskManager(object) #to allow profiles to override masks from their parent profiles. profile_pkgmasklines =3D [] profile_pkgunmasklines =3D [] - for x in profiles: + # PREFIX LOCAL: Prefix has unmasks for stuff in profiles/package.mask + # If we don't consider the repomasks here, those unmasks are + # lost, causing lots of issues (e.g. Portage being masked) + # for minimal/concentrated code change, empty repo_pkgmasklines here + # such that they don't count double + repo_pkgmasklines =3D [] + repo_pkgunmasklines =3D [] + all_profiles =3D [] + for repo in repositories.repos_with_profiles(): + all_profiles.append(os.path.join(repo.location, "profiles")) + all_profiles.extend(profiles) + for x in all_profiles: profile_pkgmasklines.append(grabfile_package( - os.path.join(x, "package.mask"), recursive=3D1, remember_source_fil= e=3DTrue, verify_eapi=3DTrue)) - profile_pkgunmasklines.append(grabfile_package( - os.path.join(x, "package.unmask"), recursive=3D1, remember_source_f= ile=3DTrue, verify_eapi=3DTrue)) + os.path.join(x.location, "package.mask"), + recursive=3Dx.portage1_directories, + remember_source_file=3DTrue, verify_eapi=3DTrue)) + if x.portage1_directories: + profile_pkgunmasklines.append(grabfile_package( + os.path.join(x.location, "package.unmask"), + recursive=3Dx.portage1_directories, + remember_source_file=3DTrue, verify_eapi=3DTrue)) profile_pkgmasklines =3D stack_lists(profile_pkgmasklines, incrementa= l=3D1, \ remember_source_file=3DTrue, warn_for_unmatched_removal=3DTrue, strict_warn_for_unmatched_removal=3Dstrict_umatched_removal) diff --cc runtests.sh index b8be75c,b7313b7..d2299f6 --- a/runtests.sh +++ b/runtests.sh @@@ -27,11 -27,31 +27,31 @@@ interrupted()=20 =20 trap interrupted SIGINT =20 + unused_args=3D() +=20 + while [[ -n $1 ]] ; do + case "$1" in + --python-versions=3D*) + PYTHON_VERSIONS=3D${1#--python-versions=3D} + ;; + --python-versions) + shift + PYTHON_VERSIONS=3D$1 + ;; + *) + unused_args[${#unused_args[@]}]=3D$1 + ;; + esac + shift + done +=20 + set -- "${unused_args[@]}" +=20 exit_status=3D"0" for version in ${PYTHON_VERSIONS}; do - if [[ -x /usr/bin/python${version} ]]; then + if [[ -x @PREFIX_PORTAGE_PYTHON@${version} ]]; then echo -e "${GOOD}Testing with Python ${version}...${NORMAL}" - if ! /usr/bin/python${version} -Wd pym/portage/tests/runTests "$@" ; = then + if ! @PREFIX_PORTAGE_PYTHON@${version} -Wd pym/portage/tests/runTests= "$@" ; then echo -e "${BAD}Testing with Python ${version} failed${NORMAL}" exit_status=3D"1" fi