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

Merge branch '10287-fix-dashes-in-interface-names' of git://github.com/dmyerscough/salt into dmyerscough-10287-fix-dashes-in-interface-names

Browse Source 
Conflicts:
	salt/utils/network.py
This commit is contained in:
Thomas S Hatch 2014-02-26 13:10:05 -07:00
commit 3c9d5ae43b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/network.py
View File

@ -171,7 +171,7 @@ def _interfaces_ip(out):
for line in group.splitlines(): for line in group.splitlines():
if not ' ' in line: if not ' ' in line:
continue continue
match = re.match(r'^\d*:\s+([\w.-]+)(?:@)?([\w.-]+)?:\s+<(.+)>', line) match = re.match(r'^\d*:\s+([\w.\-]+)(?:@)?([\w.\-]+)?:\s+<(.+)>', line)
if match: if match:
iface, parent, attrs = match.groups() iface, parent, attrs = match.groups()
if 'UP' in attrs.split(','): if 'UP' in attrs.split(','):