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

Merge pull request #18399 from hulu/routes-shadowing

Browse Source 
avoid shadowing in salt.modules.network
This commit is contained in:
Joseph Hall 2014-11-21 19:39:28 -07:00
commit 9e94072d25
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/network.py
View File

@ -998,20 +998,20 @@ def routes(family=None):
raise CommandExecutionError('Invalid address family {0}'.format(family))
if __grains__['kernel'] == 'Linux':
routes = _netstat_route_linux()
routes_ = _netstat_route_linux()
elif __grains__['os'] in ['FreeBSD', 'MacOS', 'Darwin']:
routes = _netstat_route_freebsd()
routes_ = _netstat_route_freebsd()
elif __grains__['os'] in ['NetBSD']:
routes = _netstat_route_netbsd()
routes_ = _netstat_route_netbsd()
elif __grains__['os'] in ['OpenBSD']:
routes = _netstat_route_openbsd()
routes_ = _netstat_route_openbsd()
else:
raise CommandExecutionError('Not yet supported on this platform')
if not family:
return routes
return routes_
else:
ret = [route for route in routes if route['addr_family'] == family]
ret = [route for route in routes_ if route['addr_family'] == family]
return ret