13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
13 lines
644 B
Diff
13 lines
644 B
Diff
diff -up sos-2.2/sos/plugins/networking.py.orig sos-2.2/sos/plugins/networking.py
|
|
--- sos-2.2/sos/plugins/networking.py.orig 2012-03-06 11:20:00.128319602 +0000
|
|
+++ sos-2.2/sos/plugins/networking.py 2012-03-06 11:20:10.820319845 +0000
|
|
@@ -28,7 +28,7 @@ class networking(sos.plugintools.PluginB
|
|
out=[]
|
|
fp = open(brctlFile, 'r')
|
|
for line in fp.readlines():
|
|
- if line.startswith("bridge name") or line.isspace():
|
|
+ if line.startswith("bridge name") or line.isspace() or line[:1].isspace():
|
|
continue
|
|
brName, brRest = line.split(None, 1)
|
|
out.append(brName)
|