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 1QwgV7-0000lH-Nz for garchives@archives.gentoo.org; Thu, 25 Aug 2011 20:26:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A3C621C224; Thu, 25 Aug 2011 20:26:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 538B321C222 for ; Thu, 25 Aug 2011 20:26:01 +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 AA6421B401E for ; Thu, 25 Aug 2011 20:26:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F143080040 for ; Thu, 25 Aug 2011 20:25:59 +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: <253d0140bb34d02368162b5d5fd5b030ea96965d.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: 253d0140bb34d02368162b5d5fd5b030ea96965d Date: Thu, 25 Aug 2011 20:25:59 +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: def259cb81c64aa57c9e43237941cab2 commit: 253d0140bb34d02368162b5d5fd5b030ea96965d Author: Fabian Groffen gentoo org> AuthorDate: Thu Aug 25 20:22:02 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Aug 25 20:22:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D253d0140 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild-helpers/dosym bin/ebuild | 8 +++--- bin/ebuild-helpers/dosym | 15 ++++++++---- bin/isolated-functions.sh | 7 +++++- man/make.conf.5 | 6 +++++ pym/_emerge/PipeReader.py | 6 ++++- pym/_emerge/Scheduler.py | 4 +++ pym/_emerge/SpawnProcess.py | 6 ++++- pym/portage/_sets/__init__.py | 9 +++++- pym/portage/news.py | 7 +++-- pym/portage/output.py | 12 +++++++-- .../package/ebuild/_config/LocationsManager.py | 10 +++++-- pym/portage/package/ebuild/doebuild.py | 24 ++++++++++++++= +----- pym/portage/package/ebuild/prepare_build_dirs.py | 2 +- pym/portage/repository/config.py | 16 ++++++++++-- .../tests/ebuild/test_array_fromfile_eof.py | 11 +++++--- pym/portage/tests/ebuild/test_doebuild_spawn.py | 4 +- pym/portage/update.py | 7 +++-- pym/portage/util/__init__.py | 13 +++++++--- .../util/_dyn_libs/PreservedLibsRegistry.py | 10 +++++-- pym/portage/util/_pty.py | 8 ++++-- pym/portage/xml/metadata.py | 13 +++++++++- pym/portage/xpak.py | 7 ++++- 22 files changed, 149 insertions(+), 56 deletions(-) diff --cc bin/ebuild index 58c2d83,db7e5e3..e91149e --- a/bin/ebuild +++ b/bin/ebuild @@@ -57,19 -57,13 +57,15 @@@ opts, pargs =3D parser.parse_args(args=3Dsy if len(pargs) < 2: parser.error("missing required args") =20 - if "merge" in pargs: - print("Disabling noauto in features... merge disables it. (qmerge does= n't)") - os.environ["FEATURES"] =3D os.environ.get("FEATURES", "") + " -noauto" -=20 os.environ["PORTAGE_CALLER"]=3D"ebuild" -try: - import portage -except ImportError: - from os import path as osp - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__fil= e__))), "pym")) - import portage +# for an explanation on this logic, see pym/_emerge/__init__.py +from os import environ as ose +from os import path as osp +if ose.__contains__("PORTAGE_PYTHONPATH"): + sys.path.insert(0, ose["PORTAGE_PYTHONPATH"]) +else: + sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp. = realpath(__file__))), "pym")) +import portage =20 portage.dep._internal_warnings =3D True from portage import os diff --cc bin/ebuild-helpers/dosym index bd4044f,7dd4c6d..16e0df0 --- a/bin/ebuild-helpers/dosym +++ b/bin/ebuild-helpers/dosym @@@ -9,13 -9,16 +9,18 @@@ if [[ $# -ne 2 ]] ; the exit 1 fi =20 - target=3D"${1}" - linkname=3D"${2}" - [[ ${target:0:1} =3D=3D "/" ]] && target=3D"${EPREFIX}${target}" - destdir=3D${linkname%/*} + if [[ ${2} =3D=3D */ ]] || \ - [[ -d ${D}${2} && ! -L ${D}${2} ]] ; then ++ [[ -d ${ED}${2} && ! -L ${ED}${2} ]] ; then + # implicit basename not allowed by PMS (bug #379899) + eqawarn "QA Notice: dosym target omits basename: '${2}'" + fi +=20 + destdir=3D${2%/*} -[[ ! -d ${D}${destdir} ]] && dodir "${destdir}" +[[ ! -d ${ED}${destdir} ]] && dodir "${destdir}" =20 - ln -snf "${target}" "${ED}/${linkname}" -ln -snf "$1" "${D}$2" ++target=3D"${1}" ++[[ ${target:0:1} =3D=3D "/" ]] && target=3D"${EPREFIX}${target}" ++ln -snf "${target}" "${ED}/${2}" ret=3D$? [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret