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 1RyKhO-00053D-8N for garchives@archives.gentoo.org; Fri, 17 Feb 2012 10:05:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11117E09FD; Fri, 17 Feb 2012 10:05:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CF8B0E09FD for ; Fri, 17 Feb 2012 10:05:46 +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 3B1731B4021 for ; Fri, 17 Feb 2012 10:05:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DDB4CE5400 for ; Fri, 17 Feb 2012 10:05:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1329473068.8c6f5e6c2d341953ea5574974cecf906ddb67e71.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/SubProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8c6f5e6c2d341953ea5574974cecf906ddb67e71 X-VCS-Branch: master Date: Fri, 17 Feb 2012 10:05:44 +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: eed25979-bac2-4df8-a531-010d164b263e X-Archives-Hash: bfa798566cc0b717daaad136ebc6b671 commit: 8c6f5e6c2d341953ea5574974cecf906ddb67e71 Author: Zac Medico gentoo org> AuthorDate: Fri Feb 17 10:04:28 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Feb 17 10:04:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D8c6f5e6c SubProcess._waitpid_cb: fix args for glib compat --- pym/_emerge/SubProcess.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index 9c033c5..76b313f 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -100,7 +100,7 @@ class SubProcess(AbstractPollTask): finally: self.scheduler.source_remove(source_id) =20 - def _waitpid_cb(self, pid, condition, user_data): + def _waitpid_cb(self, pid, condition, user_data=3DNone): if pid !=3D self.pid: raise AssertionError("expected pid %s, got %s" % (self.pid, pid)) self._set_returncode((pid, condition))