From: Millian Poquet <millian.poquet@inria.fr>
Date: Thu, 22 Feb 2018 15:44:24 +0000 (+0100)
Subject: [tesh] pgid func fail: catch * -> catch OSError
X-Git-Tag: v3.19~180^2~2
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d93440cdfdf32235a8cc25ef89e395ed21c76b1a

[tesh] pgid func fail: catch * -> catch OSError
---

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index cef0fa8665..37f8289c9c 100755
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -109,7 +109,8 @@ def kill_process_group(pgid):
     # print("Kill process group {}".format(pgid))
     try:
         os.killpg(pgid, signal.SIGTERM)
-    except: # Ugly and psychorigid. Please improve python doc so we know what exceptions killpg can throw.
+    except OSError:
+        # os.killpg failed. OK. Some subprocesses may still be running.
         pass
 
 def signal_handler(signal, frame):
@@ -316,8 +317,8 @@ class Cmd(object):
             proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, preexec_fn=os.setsid)
             try:
                 pgtokill = os.getpgid(proc.pid)
-            except: # Ugly and psychorigid. Please improve python doc so we know what exceptions getpgid can throw.
-                # os.getpgid failed. OK, no cleanup.
+            except OSError:
+                # os.getpgid failed. OK. No cleanup.
                 pass
         except FileNotFoundError:
             print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': File not found")