From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QQJLb-0003QT-VZ for garchives@archives.gentoo.org; Sat, 28 May 2011 13:14:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 991C41C074; Sat, 28 May 2011 13:14:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6C3D31C074 for ; Sat, 28 May 2011 13:14:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBE7E1B401B for ; Sat, 28 May 2011 13:14:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 315C980505 for ; Sat, 28 May 2011 13:14:23 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <48cf4874fb23281bc3679a6b5247167b51e86c1c.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: 48cf4874fb23281bc3679a6b5247167b51e86c1c Date: Sat, 28 May 2011 13:14:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 76847a6016bfaf490c8e0d9de0b7ef31 commit: 48cf4874fb23281bc3679a6b5247167b51e86c1c Author: Thomas Sachau gentoo org> AuthorDate: Sat May 28 13:13:14 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sat May 28 13:13:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D48cf4874 Merge commit 'v2.2.0_alpha37' into multilib bin/etc-update | 2 +- man/emerge.1 | 2 +- pym/_emerge/AsynchronousLock.py | 10 ++-- pym/_emerge/BlockerDB.py | 9 ++- pym/_emerge/FakeVartree.py | 12 ++++- pym/_emerge/depgraph.py | 31 +++++++---- pym/_emerge/unmerge.py | 2 +- pym/portage/dbapi/_MergeProcess.py | 9 +++ pym/portage/dbapi/vartree.py | 105 +++++++++++++++++++-----------= ------ 9 files changed, 107 insertions(+), 75 deletions(-)