Merge remote branch 'origin/V7_dev'

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

diff --git a/bin/PortManager.py b/bin/PortManager.py
index 6532587133c7a7d9d0f9d2d2833ef4b0cc7962b3..d324bdebc4735bc13a51c005f599dc942b3f649f 100644 (file)
--- a/bin/PortManager.py
+++ b/bin/PortManager.py
@@ -90,7 +90,10 @@ def __isNetworkConnectionActiveOnPort(port):
   #        netstat options -l and -t are unavailable
   #        grep command is unavailable
   from subprocess import Popen, PIPE
-  stdout, _ = Popen(['netstat','-an'], stdout=PIPE).communicate()
+  if sys.platform == "win32":
+    stdout, _ = Popen(['netstat','-a','-n','-p tcp'], stdout=PIPE).communicate()
+  else:
+    stdout, _ = Popen(['netstat','-ant'], stdout=PIPE).communicate()
   import StringIO
   buf = StringIO.StringIO(stdout)
   ports = buf.readlines()
@@ -103,6 +106,7 @@ def __isNetworkConnectionActiveOnPort(port):
       if p == port: return True
     except:
       pass
+  return False
 #
 
 def getPort(preferedPort=None):