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 C8FB51381F3 for ; Mon, 9 Sep 2013 16:57:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64DA2E0B7A; Mon, 9 Sep 2013 16:57:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0975DE0B7A for ; Mon, 9 Sep 2013 16:57:07 +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 2000833E66D for ; Mon, 9 Sep 2013 16:57:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CA424E468F for ; Mon, 9 Sep 2013 16:57:05 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1378745809.a5641bf514ded96c160e6cb94a1fdf9ede84778a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/SpawnProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a5641bf514ded96c160e6cb94a1fdf9ede84778a X-VCS-Branch: master Date: Mon, 9 Sep 2013 16:57:05 +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: 36ff6bd6-3979-4965-bc07-b65431b7dfbe X-Archives-Hash: 857c3b3f0aa6d202efbe065ff418e4fa commit: a5641bf514ded96c160e6cb94a1fdf9ede84778a Author: Zac Medico gentoo org> AuthorDate: Mon Sep 9 16:56:49 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 9 16:56:49 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a5641bf5 SpawnProcess: convert cgroup pids to int earlier --- pym/_emerge/SpawnProcess.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index 6024ef7..b36d15f 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -190,7 +190,7 @@ class SpawnProcess(SubProcess): def get_pids(cgroup): try: with open(os.path.join(cgroup, 'cgroup.procs'), 'r') as f: - return f.read().split() + return [int(p) for p in f.read().split()] except OSError: # cgroup removed already? return [] @@ -198,7 +198,7 @@ class SpawnProcess(SubProcess): def kill_all(pids, sig): for p in pids: try: - os.kill(int(p), sig) + os.kill(p, sig) except OSError as e: if e.errno == errno.EPERM: # Reported with hardened kernel (bug #358211).