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 <gentoo-commits+bounces-329482-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Q3KKm-0003Xu-JI
	for garchives@archives.gentoo.org; Sat, 26 Mar 2011 03:38:40 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F36981C00F;
	Sat, 26 Mar 2011 03:38:32 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 9A3631C00F
	for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 03:38:32 +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 275091B410B
	for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 03:38:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 2EB688006E
	for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 03:38:31 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <2e6fe9eb779b94d1f00d9ebdbdf76b3f026ebcd2.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/_emerge/PackageMerge.py
X-VCS-Directories: pym/_emerge/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 2e6fe9eb779b94d1f00d9ebdbdf76b3f026ebcd2
Date: Sat, 26 Mar 2011 03:38:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: a66be231555f30a4b75423667304c799

commit:     2e6fe9eb779b94d1f00d9ebdbdf76b3f026ebcd2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 03:38:11 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 03:38:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D2e6fe9eb

PackageMerge: call wait() for conformity

---
 pym/_emerge/PackageMerge.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/pym/_emerge/PackageMerge.py b/pym/_emerge/PackageMerge.py
index 15d8ede..832eac0 100644
--- a/pym/_emerge/PackageMerge.py
+++ b/pym/_emerge/PackageMerge.py
@@ -39,5 +39,4 @@ class PackageMerge(AsynchronousTask):
=20
 	def exit_handler(self, task):
 		self.returncode =3D task.returncode
-		self._wait_hook()
-
+		self.wait()