Fix #6326: bridge.show returns none when no bridge is found

saltstack · Jul 26, 2013 · 9d2ccc9 · 9d2ccc9
1 parent 5de7cd5
commit 9d2ccc9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/salt/modules/bridge.py b/salt/modules/bridge.py
@@ -74,7 +74,10 @@ def _linux_brshow(br=None):
             brs[brname]['interfaces'].append(vals[0])
 
     if br:
-        return brs[br]
+        try:
+            return brs[br]
+        except KeyError, ke :
+            return None
     return brs
 
 
@@ -151,7 +154,10 @@ def _netbsd_brshow(br=None):
                     brs[brname]['stp'] = 'yes'
 
     if br:
-        return brs[br]
+        try:
+            return brs[br]
+        except KeyError, ke :
+            return None
     return brs