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 E2C361383D4 for ; Thu, 10 Jan 2013 21:02:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0A4221C048; Thu, 10 Jan 2013 21:02:33 +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 4AEEA21C048 for ; Thu, 10 Jan 2013 21:02:33 +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 1E02E33D3D7 for ; Thu, 10 Jan 2013 21:02:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ABD25E4075 for ; Thu, 10 Jan 2013 21:02:30 +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: <1357851683.754956bff8273df8ce2c3d9f6ff7fb22126ebd41.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: 754956bff8273df8ce2c3d9f6ff7fb22126ebd41 X-VCS-Branch: prefix Date: Thu, 10 Jan 2013 21:02:30 +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: d5668126-ffd7-40c4-bc90-f2df82f3cb3a X-Archives-Hash: 0233187754e0222c43663074dbc0f7fa commit: 754956bff8273df8ce2c3d9f6ff7fb22126ebd41 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 10 21:01:23 2013 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 10 21:01:23 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=754956bf Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/portage/package/ebuild/doebuild.py Makefile | 2 +- bin/emirrordist | 13 + man/emirrordist.1 | 143 +++++ man/make.conf.5 | 4 +- pym/_emerge/MetadataRegen.py | 23 +- pym/_emerge/Scheduler.py | 4 +- pym/_emerge/SpawnProcess.py | 20 + pym/_emerge/depgraph.py | 13 +- pym/portage/_emirrordist/Config.py | 132 +++++ pym/portage/_emirrordist/DeletionIterator.py | 83 +++ pym/portage/_emirrordist/DeletionTask.py | 129 ++++ pym/portage/_emirrordist/FetchIterator.py | 147 +++++ pym/portage/_emirrordist/FetchTask.py | 620 ++++++++++++++++++++ pym/portage/_emirrordist/MirrorDistTask.py | 218 +++++++ .../sync => portage/_emirrordist}/__init__.py | 2 +- pym/portage/_emirrordist/main.py | 437 ++++++++++++++ pym/portage/dbapi/porttree.py | 5 +- pym/portage/dbapi/vartree.py | 4 +- pym/portage/manifest.py | 36 +- .../ebuild/_parallel_manifest/ManifestScheduler.py | 19 +- .../ebuild/_parallel_manifest/ManifestTask.py | 10 +- pym/portage/package/ebuild/config.py | 15 +- pym/portage/package/ebuild/doebuild.py | 10 +- pym/portage/tests/emerge/test_simple.py | 8 +- pym/portage/tests/process/test_PopenProcess.py | 7 +- pym/portage/util/_ShelveUnicodeWrapper.py | 45 ++ pym/portage/util/_async/AsyncScheduler.py | 4 +- pym/portage/util/_async/FileCopier.py | 17 + pym/portage/util/_async/PipeLogger.py | 16 +- pym/portage/util/_ctypes.py | 10 +- 30 files changed, 2121 insertions(+), 75 deletions(-) diff --cc pym/portage/package/ebuild/doebuild.py index 43f60ef,e4d3ae4..2f026ab --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@@ -162,10 -160,15 +162,18 @@@ def _doebuild_path(settings, eapi=None) eprefix = settings["EPREFIX"] prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x] rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x] + overrides = [x for x in settings.get( + "__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x] + + prefixes = [] + if eprefix: + prefixes.append(eprefix) + prefixes.append("/") + + path = overrides + # PREFIX LOCAL: use DEFAULT_PATH and EXTRA_PATH from make.globals + defaultpath = [x for x in settings.get("DEFAULT_PATH", "").split(":") if x] + extrapath = [x for x in settings.get("EXTRA_PATH", "").split(":") if x] - path = [] if eprefix and uid != 0 and "fakeroot" not in settings.features: path.append(os.path.join(portage_bin_path,