From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E82601381F3 for ; Fri, 13 Sep 2013 18:02:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B0DFE0BFA; Fri, 13 Sep 2013 18:02:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E1DEE0BFA for ; Fri, 13 Sep 2013 18:02:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 639E533EC3B for ; Fri, 13 Sep 2013 18:02:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 165D7E468F for ; Fri, 13 Sep 2013 18:02:45 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1379095265.2c40532f5b2aedbe9ceaa4c4595fc905773f72a0.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: 2c40532f5b2aedbe9ceaa4c4595fc905773f72a0 X-VCS-Branch: prefix Date: Fri, 13 Sep 2013 18:02: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 X-Archives-Salt: ac1897b5-2c2a-4416-9db7-a515d26475eb X-Archives-Hash: 87a34a144190a3a456bae3a650df7fd1 commit: 2c40532f5b2aedbe9ceaa4c4595fc905773f72a0 Author: Fabian Groffen gentoo org> AuthorDate: Fri Sep 13 18:01:05 2013 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Sep 13 18:01:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2c40532f Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild-helpers/unprivileged/chown NEWS | 5 + bin/archive-conf | 26 +---- bin/dohtml.py | 47 ++++++-- bin/eapi.sh | 4 + bin/ebuild-helpers/doexe | 3 +- bin/ebuild-helpers/doins | 3 +- bin/ebuild-helpers/keepdir | 20 ++++ bin/ebuild-helpers/newins | 10 +- bin/ebuild-helpers/unprivileged/chown | 10 +- bin/ebuild.sh | 2 +- bin/egencache | 15 ++- bin/install.py | 5 + bin/phase-helpers.sh | 116 ++++++++++++++----- bin/repoman | 32 +++++- bin/save-ebuild-env.sh | 2 +- doc/package/ebuild/eapi/4-python.docbook | 1 - doc/package/ebuild/eapi/5-progress.docbook | 7 +- man/make.conf.5 | 27 ++++- man/portage.5 | 13 ++- man/repoman.1 | 9 +- man/ru/ebuild.1 | 4 +- pym/_emerge/AbstractEbuildProcess.py | 39 +++++++ pym/_emerge/AsynchronousLock.py | 21 ++-- pym/_emerge/EbuildMetadataPhase.py | 20 ++-- pym/_emerge/FakeVartree.py | 11 +- pym/_emerge/FifoIpcDaemon.py | 16 ++- pym/_emerge/PipeReader.py | 25 ++-- pym/_emerge/SpawnProcess.py | 62 ++++++++-- pym/_emerge/SubProcess.py | 19 +++- pym/_emerge/actions.py | 75 ++++++++---- pym/portage/__init__.py | 18 --- pym/portage/_emirrordist/main.py | 15 ++- pym/portage/cache/fs_template.py | 5 +- pym/portage/const.py | 10 +- pym/portage/data.py | 2 +- pym/portage/dbapi/_MergeProcess.py | 21 ++-- pym/portage/dbapi/vartree.py | 4 +- pym/portage/dep/dep_check.py | 31 +++-- pym/portage/locks.py | 23 ++-- pym/portage/package/ebuild/doebuild.py | 57 +++++++++- pym/portage/process.py | 126 +++++++++++++++++++-- pym/portage/repository/config.py | 12 +- pym/portage/tests/process/test_poll.py | 36 +++--- .../tests/resolver/test_autounmask_multilib_use.py | 85 ++++++++++++++ pym/portage/tests/resolver/test_or_choices.py | 55 +++++++++ pym/portage/util/__init__.py | 47 +++++--- pym/portage/util/_async/PipeLogger.py | 21 ++-- pym/portage/util/_ctypes.py | 2 +- pym/portage/util/_desktop_entry.py | 14 +++ pym/portage/util/_eventloop/EventLoop.py | 29 +++-- pym/portage/util/movefile.py | 14 ++- pym/repoman/checks.py | 63 ++++++----- 52 files changed, 1015 insertions(+), 324 deletions(-) diff --cc bin/ebuild-helpers/unprivileged/chown index 2a60b58,08fa650..86b87c2 --- a/bin/ebuild-helpers/unprivileged/chown +++ b/bin/ebuild-helpers/unprivileged/chown @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 2012 Gentoo Foundation + # Copyright 2012-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 scriptpath=${BASH_SOURCE[0]} @@@ -13,7 -13,15 +13,15 @@@ for path in ${PATH}; d IFS=$' \t\n' output=$("${path}/${scriptname}" "$@" 2>&1) if [[ $? -ne 0 ]] ; then + + # Avoid an extreme performance problem when the + # output is very long (bug #470992). + if [[ $(wc -l <<< "${output}") -gt 100 ]]; then + output=$(head -n100 <<< "${output}") + output="${output}\n ... (further messages truncated)" + fi + - source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh + source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh if ! ___eapi_has_prefix_variables; then EPREFIX= diff --cc pym/portage/process.py index 0876e4c,9ae7a55..439b6c9 --- a/pym/portage/process.py +++ b/pym/portage/process.py @@@ -19,8 -22,9 +22,9 @@@ portage.proxy.lazyimport.lazyimport(glo 'portage.util:dump_traceback,writemsg', ) -from portage.const import BASH_BINARY, SANDBOX_BINARY, FAKEROOT_BINARY +from portage.const import BASH_BINARY, SANDBOX_BINARY, MACOSSANDBOX_BINARY, FAKEROOT_BINARY from portage.exception import CommandNotFound + from portage.util._ctypes import find_library, LoadLibrary, ctypes try: import resource