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 7D8EF138A1F for ; Tue, 22 Apr 2014 19:52:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AB2AE0964; Tue, 22 Apr 2014 19:52:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB7E8E0964 for ; Tue, 22 Apr 2014 19:52:12 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9913033FF1E for ; Tue, 22 Apr 2014 19:52:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 23FAA1818D for ; Tue, 22 Apr 2014 19:52:09 +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: <1398196291.0a8f92ef5e248e0726454769806c1d7b1a60bb67.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: 0a8f92ef5e248e0726454769806c1d7b1a60bb67 X-VCS-Branch: prefix Date: Tue, 22 Apr 2014 19:52:09 +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: ed7ed42e-69a5-4732-88bb-b6af2f964427 X-Archives-Hash: b58d906e24bf493fc07204c97c21cae6 commit: 0a8f92ef5e248e0726454769806c1d7b1a60bb67 Author: Fabian Groffen gentoo org> AuthorDate: Tue Apr 22 19:51:31 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Apr 22 19:51:31 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0a8f92ef Merge tag 'v2.2.10' into prefix Conflicts: pym/portage/dbapi/bintree.py DEVELOPING | 3 +- README | 11 +- RELEASE-NOTES | 11 +- bin/repoman | 19 ++- man/emerge.1 | 11 +- man/make.conf.5 | 2 +- man/portage.5 | 78 ++---------- mkrelease.sh | 15 ++- pym/_emerge/actions.py | 15 ++- pym/_emerge/create_depgraph_params.py | 3 +- pym/_emerge/depgraph.py | 101 +++++++++------- pym/_emerge/help.py | 4 +- pym/_emerge/main.py | 12 +- pym/_emerge/resolver/slot_collision.py | 1 + pym/_emerge/unmerge.py | 5 +- pym/portage/dbapi/bintree.py | 5 +- pym/portage/dbapi/vartree.py | 18 +-- pym/portage/emaint/main.py | 10 +- pym/portage/package/ebuild/_config/MaskManager.py | 8 +- pym/portage/package/ebuild/_config/UseManager.py | 21 +--- pym/portage/package/ebuild/fetch.py | 7 +- pym/portage/package/ebuild/getmaskingreason.py | 6 +- pym/portage/repository/config.py | 132 +++++++++------------ pym/portage/tests/emerge/test_simple.py | 1 + pym/portage/tests/resolver/test_multirepo.py | 84 ++++++++++++- pym/portage/tests/resolver/test_onlydeps.py | 34 ++++++ pym/portage/tests/resolver/test_slot_collisions.py | 33 +++++- pym/portage/tests/resolver/test_useflags.py | 78 ++++++++++++ pym/repoman/utilities.py | 44 +++++++ runtests.sh | 4 +- 30 files changed, 515 insertions(+), 261 deletions(-) diff --cc pym/portage/dbapi/bintree.py index 50c7d9d,229ce3b..45e8614 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@@ -27,8 -27,7 +27,8 @@@ from portage.const import CACHE_PAT from portage.dbapi.virtual import fakedbapi from portage.dep import Atom, use_reduce, paren_enclose from portage.exception import AlarmSignal, InvalidData, InvalidPackageName, \ - PermissionDenied, PortageException + ParseError, PermissionDenied, PortageException +from portage.const import EAPI from portage.localization import _ from portage import _movefile from portage import os