valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6327 from Anbcorp/bridge_fixes

Browse Source 
Fix #6326: bridge.show returns none when no bridge is found
This commit is contained in:
Joseph Hall 2013-07-26 07:28:48 -07:00
commit 04914f6b1a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/bridge.py
View File

@ -74,7 +74,10 @@ def _linux_brshow(br=None):
brs[brname]['interfaces'].append(vals[0]) brs[brname]['interfaces'].append(vals[0])
if br: if br:
return brs[br] try:
return brs[br]
except KeyError, ke :
return None
return brs return brs
@ -151,7 +154,10 @@ def _netbsd_brshow(br=None):
brs[brname]['stp'] = 'yes' brs[brname]['stp'] = 'yes'
if br: if br:
return brs[br] try:
return brs[br]
except KeyError, ke :
return None
return brs return brs