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 4695B1382E6 for ; Sat, 5 Jan 2013 18:14:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC896E05D9; Sat, 5 Jan 2013 18:14:03 +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 4290CE05D9 for ; Sat, 5 Jan 2013 18:14:03 +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 31CAE33D95D for ; Sat, 5 Jan 2013 18:14:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C2614E5439 for ; Sat, 5 Jan 2013 18:14:00 +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: <1357409521.cefe9ddc5e1b8a1ba727afddd11638723875949c.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: cefe9ddc5e1b8a1ba727afddd11638723875949c X-VCS-Branch: prefix Date: Sat, 5 Jan 2013 18:14:00 +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: 87103a05-5aef-4eaf-b6cc-97df22f7ecd7 X-Archives-Hash: 8623715dfeb03a0baaeded24a048803c commit: cefe9ddc5e1b8a1ba727afddd11638723875949c Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 5 18:12:01 2013 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jan 5 18:12:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cefe9ddc Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/archive-conf bin/binhost-snapshot bin/clean_locks bin/dispatch-conf bin/ebuild bin/ebuild-ipc.py bin/egencache bin/emaint bin/emerge bin/env-update bin/fixpackages bin/glsa-check bin/lock-helper.py bin/phase-functions.sh bin/portageq bin/quickpkg bin/regenworld bin/repoman bin/xpak-helper.py .gitignore | 2 + bin/archive-conf | 3 +- bin/binhost-snapshot | 3 +- bin/clean_locks | 3 +- bin/dispatch-conf | 3 +- bin/ebuild | 4 +- bin/ebuild-ipc.py | 175 ++++--------- bin/egencache | 67 +---- bin/emaint | 3 +- bin/emerge | 5 +- bin/env-update | 3 +- bin/fixpackages | 3 +- bin/glsa-check | 3 +- bin/lock-helper.py | 3 +- bin/phase-functions.sh | 6 +- bin/phase-helpers.sh | 8 +- bin/portageq | 3 +- bin/quickpkg | 3 +- bin/regenworld | 3 +- bin/repoman | 19 +- bin/xpak-helper.py | 3 +- man/color.map.5 | 4 +- man/ebuild.1 | 4 +- man/ebuild.5 | 11 +- man/egencache.1 | 4 +- man/emerge.1 | 8 +- man/make.conf.5 | 6 +- man/portage.5 | 2 +- man/quickpkg.1 | 20 ++- pym/_emerge/AbstractEbuildProcess.py | 2 +- pym/_emerge/AsynchronousLock.py | 58 ++--- pym/_emerge/AsynchronousTask.py | 14 + pym/_emerge/BinpkgFetcher.py | 2 +- pym/_emerge/BinpkgVerifier.py | 143 +++++++---- pym/_emerge/EbuildBuild.py | 4 +- pym/_emerge/EbuildFetcher.py | 6 +- pym/_emerge/EbuildMetadataPhase.py | 19 +- pym/_emerge/FakeVartree.py | 72 ++++-- pym/_emerge/FifoIpcDaemon.py | 29 ++- pym/_emerge/MergeListItem.py | 2 +- pym/_emerge/PackageUninstall.py | 6 +- pym/_emerge/PipeReader.py | 22 ++- pym/_emerge/PollScheduler.py | 6 +- pym/_emerge/Scheduler.py | 9 +- pym/_emerge/SpawnProcess.py | 6 +- pym/_emerge/actions.py | 77 +++--- pym/_emerge/depgraph.py | 89 +++++-- pym/_emerge/help.py | 4 +- pym/_emerge/main.py | 6 +- pym/portage/__init__.py | 4 +- pym/portage/cache/flat_hash.py | 9 +- pym/portage/checksum.py | 17 +- pym/portage/dbapi/_MergeProcess.py | 18 +- pym/portage/dbapi/_SyncfsProcess.py | 53 ++++ pym/portage/dbapi/bintree.py | 38 ++- pym/portage/dbapi/porttree.py | 15 +- pym/portage/dbapi/vartree.py | 65 ++--- pym/portage/dep/__init__.py | 14 +- pym/portage/locks.py | 11 +- pym/portage/manifest.py | 11 +- pym/portage/package/ebuild/_spawn_nofetch.py | 6 +- pym/portage/package/ebuild/doebuild.py | 54 ++++- pym/portage/process.py | 14 +- pym/portage/tests/dep/test_paren_reduce.py | 11 +- .../tests/process/test_PopenProcessBlockingIO.py | 63 +++++ pym/portage/tests/repoman/test_echangelog.py | 6 +- pym/portage/tests/runTests | 1 + pym/portage/util/_async/FileDigester.py | 73 ++++++ pym/portage/util/_async/PipeLogger.py | 22 +- pym/portage/util/_async/PipeReaderBlockingIO.py | 91 +++++++ pym/portage/util/_async/SchedulerInterface.py | 25 +-- pym/portage/util/_async/run_main_scheduler.py | 41 +++ pym/portage/util/_ctypes.py | 10 +- pym/portage/util/_eventloop/EventLoop.py | 271 +++++++++++++------ pym/repoman/checks.py | 17 +- runtests.sh | 32 +++- 76 files changed, 1287 insertions(+), 665 deletions(-) diff --cc bin/archive-conf index b166977,2c10884..26c05cf --- a/bin/archive-conf +++ b/bin/archive-conf @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --cc bin/binhost-snapshot index f5b9979,e9bd45a..4c64cb7 --- a/bin/binhost-snapshot +++ b/bin/binhost-snapshot @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010-2012 Gentoo Foundation + # Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import io diff --cc bin/clean_locks index 29c22ff,0a97918..71bd42b --- a/bin/clean_locks +++ b/bin/clean_locks @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -O +#!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/dispatch-conf index 5803026,e44c0ea..8e070ee --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -O +#!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --cc bin/ebuild index 7725f67,754b9a9..a3ac418 --- a/bin/ebuild +++ b/bin/ebuild @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -O +#!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/ebuild-ipc.py index 7533c8c,d351e94..a3432c8 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010-2012 Gentoo Foundation + # Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # This is a helper which ebuild processes can use diff --cc bin/egencache index afa8db1,87673a0..c071c10 --- a/bin/egencache +++ b/bin/egencache @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2009-2012 Gentoo Foundation + # Copyright 2009-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/emaint index 932d974,bc1b92f..cf754e6 --- a/bin/emaint +++ b/bin/emaint @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -O +#!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 2005-2012 Gentoo Foundation + # Copyright 2005-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 """'The emaint program provides an interface to system health diff --cc bin/emerge index 463b05c,fc85d58..d7470ed --- a/bin/emerge +++ b/bin/emerge @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2006-2012 Gentoo Foundation + # Copyright 2006-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/env-update index ef3433f,b500c54..09ccb4d --- a/bin/env-update +++ b/bin/env-update @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -O +#!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/fixpackages index 3f37e3f,e224b62..b31a4b8 --- a/bin/fixpackages +++ b/bin/fixpackages @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/glsa-check index 5fe9b75,ed0df35..14f6e47 --- a/bin/glsa-check +++ b/bin/glsa-check @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2008-2012 Gentoo Foundation + # Copyright 2008-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/lock-helper.py index 2e9c887,128e4dd..3a27e32 --- a/bin/lock-helper.py +++ b/bin/lock-helper.py @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010-2011 Gentoo Foundation + # Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import os diff --cc bin/phase-functions.sh index 52a9954,01c6f55..e8d9863 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PREFIX_PORTAGE_BASH@ - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Hardcoded bash lists are needed for backward compatibility with diff --cc bin/portageq index b7ab6a4,ee776ef..5c9c064 --- a/bin/portageq +++ b/bin/portageq @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -O +#!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/quickpkg index 4d3a15e,19d90b0..e271881 --- a/bin/quickpkg +++ b/bin/quickpkg @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --cc bin/regenworld index 0b7da44,f74b3dd..3416aff --- a/bin/regenworld +++ b/bin/regenworld @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function @@@ -9,7 -9,10 +9,8 @@@ from os import path as os pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") sys.path.insert(0, pym_path) import portage + portage._internal_caller = True from portage import os -from portage._sets.files import StaticFileSet, WorldSelectedSet - import re import tempfile import textwrap diff --cc bin/repoman index eeb6882,4c00d5b..54a8015 --- a/bin/repoman +++ b/bin/repoman @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -O +#!@PREFIX_PORTAGE_PYTHON@ -O - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Next to do: dep syntax checking in mask files diff --cc bin/xpak-helper.py index 1d57069,7a3865c..cc7f120 --- a/bin/xpak-helper.py +++ b/bin/xpak-helper.py @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2009-2011 Gentoo Foundation + # Copyright 2009-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import optparse diff --cc pym/portage/dbapi/vartree.py index f1970d1,ba149b7..8af2c50 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@@ -29,14 -30,11 +30,14 @@@ portage.proxy.lazyimport.lazyimport(glo 'portage.util.env_update:env_update', 'portage.util.listdir:dircache,listdir', 'portage.util.movefile:movefile', - 'portage.util._ctypes:find_library,LoadLibrary', '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.util._async.SchedulerInterface:SchedulerInterface', 'portage.util._eventloop.EventLoop:EventLoop', + 'portage.util._eventloop.global_event_loop:global_event_loop', 'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,vercmp,' + \ '_pkgsplit@pkgsplit,_pkg_str,_unknown_repo', 'subprocess',