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 1Q0IYf-0003a5-52 for garchives@archives.gentoo.org; Thu, 17 Mar 2011 19:08:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 685D91C007; Thu, 17 Mar 2011 19:08:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 330D01C007 for ; Thu, 17 Mar 2011 19:08:21 +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 A73DE1B4063 for ; Thu, 17 Mar 2011 19:08:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 094F58006A for ; Thu, 17 Mar 2011 19:08:20 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: 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: cd90208398adabd458ef811d1f60d055dd4c146b Date: Thu, 17 Mar 2011 19:08:20 +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: 4bc66442a5f5fb435e671e60fd128106 commit: cd90208398adabd458ef811d1f60d055dd4c146b Author: Fabian Groffen gentoo org> AuthorDate: Thu Mar 17 19:05:48 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Mar 17 19:05:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dcd902083 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix cnf/make.conf | 2 +- man/emerge.1 | 6 +++--- man/make.conf.5 | 2 +- pym/_emerge/AbstractPollTask.py | 3 +++ pym/_emerge/AsynchronousLock.py | 4 ++++ pym/_emerge/AsynchronousTask.py | 15 ++++++++++++--- pym/_emerge/Binpkg.py | 9 ++++----- pym/_emerge/CompositeTask.py | 32 ++++++++++++++++++++++++++= +----- pym/_emerge/EbuildBuild.py | 5 ++--- pym/_emerge/EbuildExecuter.py | 4 ++-- pym/_emerge/FifoIpcDaemon.py | 6 ++---- pym/_emerge/PipeReader.py | 6 ++---- pym/_emerge/QueueScheduler.py | 2 +- pym/_emerge/Scheduler.py | 20 +++++++++++++++----- pym/_emerge/SubProcess.py | 8 +------- pym/_emerge/TaskSequence.py | 3 +-- pym/_emerge/help.py | 7 +++++-- pym/_emerge/main.py | 29 ++++++++++++++++++++++++++= --- pym/_emerge/resolver/slot_collision.py | 2 +- pym/portage/dbapi/vartree.py | 8 -------- pym/portage/dep/dep_check.py | 9 +++++---- pym/portage/util/__init__.py | 2 +- 22 files changed, 119 insertions(+), 65 deletions(-)