#20171 [CEA 20071] Handle missing netstat

[modules/kernel.git] / bin / addToKillList.py

diff --git a/bin/addToKillList.py b/bin/addToKillList.py
index 06a32f46b4dbc81b2df4bfda25dc68b2e18b2ccd..762839ad99cab8af88142c1ea106a1234525db88 100755 (executable)
--- a/bin/addToKillList.py
+++ b/bin/addToKillList.py
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -50,9 +50,10 @@ def addToKillList(command_pid, command, port=None):
     from killSalomeWithPort import getPiDict
     if port is None: port=findFileDict()
     filedict = getPiDict(port)
+    #filedict = getPiDict(port).encode()
 
     try:
-        with open(filedict, 'r') as fpid:
+        with open(filedict, 'rb') as fpid:
             process_ids=pickle.load(fpid)
     except:
         process_ids=[]
@@ -60,7 +61,7 @@ def addToKillList(command_pid, command, port=None):
     # check if PID is already in dictionary
     already_in=False
     for process_id in process_ids:
-        for pid in list(process_id.keys()):
+        for pid in process_id:
             if int(pid) == int(command_pid):
                 already_in=True
                 break
@@ -71,14 +72,14 @@ def addToKillList(command_pid, command, port=None):
     # add process to the dictionary
     if not already_in:
         import types
-        if type(command) == list: command=" ".join([str(c) for c in command])
+        if isinstance(command, list): command=" ".join([str(c) for c in command])
         command=command.split()[0]
         try:
             if verbose(): print("addToKillList: %s : %s" % ( str(command_pid), command ))
             process_ids.append({int(command_pid): [command]})
             dir = os.path.dirname(filedict)
             if not os.path.exists(dir): os.makedirs(dir, 0o777)
-            with open(filedict,'w') as fpid:
+            with open(filedict,'wb') as fpid:
                 pickle.dump(process_ids, fpid)
         except:
             if verbose(): print("addToKillList: can not add command %s : %s to the kill list" % ( str(command_pid), command ))
@@ -102,7 +103,7 @@ def killList(port=None):
     if not os.path.exists(filedict): filedict = getPiDict(port, hidden=False)
 
     try:
-        with open(filedict, 'r') as fpid:
+        with open(filedict, 'rb') as fpid:
             process_ids=pickle.load(fpid)
     except:
         process_ids=[]
@@ -123,6 +124,8 @@ def killList(port=None):
     pass
 
 if __name__ == "__main__":
-    if verbose(): print(sys.argv)
+    if verbose(): print(sys.argv[1:])
+    if len(sys.argv) < 3:
+        sys.exit(-1)
     addToKillList(sys.argv[1], sys.argv[2])
     pass