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 1QTdMA-0000xO-64 for garchives@archives.gentoo.org; Mon, 06 Jun 2011 17:12:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96EFF1C04C; Mon, 6 Jun 2011 17:12:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 58C4A1C04C for ; Mon, 6 Jun 2011 17:12:42 +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 D16D91B4016 for ; Mon, 6 Jun 2011 17:12:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E71738003C for ; Mon, 6 Jun 2011 17:12:40 +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: <09b931e2e6f99898a0381a04543344b28213833f.grobian@gentoo> 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: 09b931e2e6f99898a0381a04543344b28213833f Date: Mon, 6 Jun 2011 17:12:40 +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: 7596a65d7fd48150a74c535f71a6fe3c commit: 09b931e2e6f99898a0381a04543344b28213833f Author: Fabian Groffen gentoo org> AuthorDate: Mon Jun 6 17:11:14 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jun 6 17:11:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D09b931e2 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/_emerge/emergelog.py NEWS | 11 +++ RELEASE-NOTES | 9 ++ bin/ebuild | 1 - bin/etc-update | 7 +- bin/portageq | 57 ++++++++++++-- cnf/etc-update.conf | 4 + man/ebuild.5 | 6 ++ man/emerge.1 | 6 +- pym/_emerge/Binpkg.py | 22 ++---- pym/_emerge/MergeListItem.py | 2 +- pym/_emerge/Package.py | 3 +- pym/_emerge/PackageArg.py | 5 +- pym/_emerge/Scheduler.py | 75 +-------------= ---- pym/_emerge/actions.py | 2 +- pym/_emerge/create_world_atom.py | 12 ++- pym/_emerge/depgraph.py | 59 ++++++++++++--= - pym/_emerge/emergelog.py | 5 +- pym/_emerge/help.py | 6 +- pym/_emerge/main.py | 28 ++++--- pym/_emerge/resolver/circular_dependency.py | 4 +- pym/_emerge/unmerge.py | 2 +- pym/portage/__init__.py | 35 +++++++- pym/portage/_sets/base.py | 10 ++- pym/portage/_sets/files.py | 6 +- pym/portage/dbapi/_MergeProcess.py | 9 ++- pym/portage/dbapi/__init__.py | 20 +++--- pym/portage/dbapi/bintree.py | 9 ++- pym/portage/dbapi/dep_expand.py | 25 ++++-- pym/portage/dbapi/porttree.py | 63 +++++++++-----= -- pym/portage/dbapi/vartree.py | 81 +++++++++-----= ------ pym/portage/dep/dep_check.py | 11 ++- pym/portage/getbinpkg.py | 2 +- .../package/ebuild/_config/KeywordsManager.py | 3 +- pym/portage/package/ebuild/_config/MaskManager.py | 3 +- pym/portage/package/ebuild/_config/helper.py | 5 +- pym/portage/package/ebuild/config.py | 10 ++- pym/portage/package/ebuild/doebuild.py | 4 +- pym/portage/package/ebuild/getmaskingreason.py | 42 ++++++++--- pym/portage/package/ebuild/getmaskingstatus.py | 7 +- pym/portage/repository/config.py | 30 +++++--- pym/portage/tests/resolver/test_merge_order.py | 36 +++++++++- pym/portage/tests/util/test_digraph.py | 12 ++-- pym/portage/util/__init__.py | 11 ++- pym/portage/util/mtimedb.py | 8 ++- pym/repoman/checks.py | 5 +- 45 files changed, 480 insertions(+), 293 deletions(-) diff --cc bin/etc-update index 2054389,42518ad..0936295 --- a/bin/etc-update +++ b/bin/etc-update @@@ -549,18 -548,14 +549,19 @@@ rm -rf "${TMP}" 2> /dev/nul mkdir "${TMP}" || die "failed to create temp dir" 1 # make sure we have a secure directory to work in chmod 0700 "${TMP}" || die "failed to set perms on temp dir" 1 -chown ${UID:-0}:${GID:-0} "${TMP}" || die "failed to set ownership on t= emp dir" 1 +# GID need not to be available, and group 0 is not cool when not being +# root, hence just rely on mkdir to have created a dir which is owned b= y +# the user +if [[ -z ${UID} || ${UID} =3D=3D 0 ]] ; then + chown ${UID:-0}:${GID:-0} "${TMP}" || die "failed to set ownership on = temp dir" 1 +fi =20 # I need the CONFIG_PROTECT value -#CONFIG_PROTECT=3D$(/usr/lib/portage/bin/portageq envvar CONFIG_PROTECT= ) -#CONFIG_PROTECT_MASK=3D$(/usr/lib/portage/bin/portageq envvar CONFIG_PR= OTECT_MASK) +#CONFIG_PROTECT=3D$(@PORTAGE_BASE@/bin/portageq envvar CONFIG_PROTECT) +#CONFIG_PROTECT_MASK=3D$(@PORTAGE_BASE@/bin/portageq envvar CONFIG_PROT= ECT_MASK) =20 # load etc-config's configuration + CLEAR_TERM=3D$(get_config clear_term) EU_AUTOMERGE=3D$(get_config eu_automerge) rm_opts=3D$(get_config rm_opts) mv_opts=3D$(get_config mv_opts) diff --cc bin/portageq index 5f0e698,fa71388..800b444 --- a/bin/portageq +++ b/bin/portageq @@@ -21,16 -21,11 +21,15 @@@ except KeyboardInterrupt sys.exit(128 + signal.SIGINT) =20 import os - import subprocess import types =20 +# for an explanation on this logic, see pym/_emerge/__init__.py +if os.environ.__contains__("PORTAGE_PYTHONPATH"): + pym_path =3D os.environ["PORTAGE_PYTHONPATH"] +else: + pym_path =3D os.path.join(os.path.dirname( + os.path.dirname(os.path.realpath(__file__))), "pym") # Avoid sandbox violations after python upgrade. -pym_path =3D os.path.join(os.path.dirname( - os.path.dirname(os.path.realpath(__file__))), "pym") if os.environ.get("SANDBOX_ON") =3D=3D "1": sandbox_write =3D os.environ.get("SANDBOX_WRITE", "").split(":") if pym_path not in sandbox_write: diff --cc pym/_emerge/emergelog.py index 046c99b,9cac3b2..20cec9f --- a/pym/_emerge/emergelog.py +++ b/pym/_emerge/emergelog.py @@@ -12,10 -12,12 +12,13 @@@ from portage import _encoding from portage import _unicode_encode from portage.data import secpass from portage.output import xtermTitle +from portage.const import EPREFIX =20 + # We disable emergelog by default, since it's called from + # dblink.merge() and we don't want that to trigger log writes + # unless it's really called via emerge. + _disable =3D True -_emerge_log_dir =3D '/var/log' +_emerge_log_dir =3D EPREFIX + '/var/log' - _disable =3D False =20 def emergelog(xterm_titles, mystr, short_msg=3DNone): =20 diff --cc pym/portage/_sets/files.py index f422ed9,f19ecf6..7992b82 --- a/pym/portage/_sets/files.py +++ b/pym/portage/_sets/files.py @@@ -1,6 -1,7 +1,6 @@@ - # Copyright 2007 Gentoo Foundation + # Copyright 2007-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 -import errno import re from itertools import chain =20