X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sioc.py;h=b4e0b46a1d2f9d65f7f58f267797523f656872af;hb=a8363e940f827d613b687592558898b77bcd9a64;hp=489a93ee7eb0d3857d03172f421565582fcc4e56;hpb=ac31507f15c0ee02fc13c9d3b00a4f92834701f9;p=pyplnet.git

diff --git a/sioc.py b/sioc.py
index 489a93e..b4e0b46 100644
--- a/sioc.py
+++ b/sioc.py
@@ -39,20 +39,13 @@ def gifconf():
                           stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                           stderr=subprocess.PIPE, close_fds=True)
     (stdout, stderr) = ip.communicate()
-    ip.wait()
+    # no wait is needed when using communicate
     for line in stdout.split("\n"):
-        line = line.strip()
-        if line =='':continue
-
-        fields = line.split(" ")
-        # clean up fields
-        for i in range(0,len(fields)): fields[i]=fields[i].strip()
-
-        if fields[0] == "inet":
+        fields = [ field.strip() for field in line.split() ]
+        if fields and fields[0] == "inet":
             # fields[-1] is the last column in fields, which has the interface name
-            # fields[1] has the IP address
+            # fields[1] has the IP address / netmask width 
             ret[fields[-1]] = fields[1].split("/")[0]
-
     return ret
 
 def gifhwaddr(interface):