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 BD1AE138010 for ; Mon, 29 Oct 2012 12:24:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59B2A21C054; Mon, 29 Oct 2012 12:23:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D4C5C21C054 for ; Mon, 29 Oct 2012 12:23:57 +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 3FE8633D8AD for ; Mon, 29 Oct 2012 12:23:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B5A89E5436 for ; Mon, 29 Oct 2012 12:23:55 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1351513411.9db5b4a84b2c0723fb8b39c540f6182e46eeb4c3.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 9db5b4a84b2c0723fb8b39c540f6182e46eeb4c3 X-VCS-Branch: multilib Date: Mon, 29 Oct 2012 12:23:55 +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: d2cd7845-eb56-4559-a6fb-a8087d084dc6 X-Archives-Hash: dfecdb1fb6fd0ddf08bbac56c78500f4 commit: 9db5b4a84b2c0723fb8b39c540f6182e46eeb4c3 Author: Thomas Sachau gentoo org> AuthorDate: Mon Oct 29 12:23:31 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Mon Oct 29 12:23:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9db5b4a8 Merge tag 'v2.2.0_alpha142' into multilib .gitignore | 1 + bin/misc-functions.sh | 19 ++- cnf/make.globals | 2 +- man/make.conf.5 | 5 + pym/_emerge/PipeReader.py | 6 +- pym/_emerge/SpawnProcess.py | 165 ++++---------------- pym/_emerge/actions.py | 18 ++ pym/_emerge/depgraph.py | 37 ++++- pym/_emerge/resolver/backtracking.py | 26 +++- pym/portage/const.py | 1 + pym/portage/dbapi/_MergeProcess.py | 6 + pym/portage/dbapi/vartree.py | 140 ++++++++++++++++- pym/portage/emaint/modules/logs/__init__.py | 2 +- pym/portage/tests/process/test_PopenProcess.py | 44 +++++- .../tests/resolver/test_slot_conflict_rebuild.py | 107 +++++++++++++ .../resolver/test_slot_operator_unsatisfied.py | 70 ++++++++ pym/portage/util/_async/PipeLogger.py | 146 +++++++++++++++++ pym/portage/util/_ctypes.py | 47 ++++++ 18 files changed, 688 insertions(+), 154 deletions(-) diff --cc pym/portage/const.py index 58ec887,8c5bbf3..fe53907 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@@ -95,8 -94,9 +95,9 @@@ SUPPORTED_FEATURES = frozenset( "compress-index", "config-protect-if-modified", "digest", "distcc", "distcc-pump", "distlocks", "downgrade-backup", "ebuild-locks", "fakeroot", - "fail-clean", "force-mirror", "force-prefix", "getbinpkg", + "fail-clean", "force-mirror", "force-multilib", "force-prefix", "getbinpkg", "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror", + "merge-sync", "metadata-transfer", "mirror", "multilib-strict", "news", "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip", "notitles", "parallel-fetch", "parallel-install",