Fixed some malformed regular expressions.
This commit is contained in:
1 parent
6599b7ce0a
commit
08326e447f
1 file changed
+3
-3
+3
-3
@@ -267,14 +267,14 @@ class WiredInterface(Interface):
|
||||
self.Up()
|
||||
time.sleep(6)
|
||||
tool_data = misc.Run(link_tool + ' ' + self.iface, True)
|
||||
if misc.RunRegex(re.compile('(Operation not supported)|\
|
||||
(ethtool: command not found)', re.I),
|
||||
if misc.RunRegex(re.compile('(Operation not supported|\
|
||||
ethtool: command not found)', re.I),
|
||||
tool_data) is not None:
|
||||
print "ethtool check failed, falling back to mii-tool"
|
||||
link_tool = 'mii-tool'
|
||||
|
||||
tool_data = misc.Run(link_tool + ' ' + self.iface, True)
|
||||
if misc.RunRegex(re.compile('(Link detected: yes)|(link ok)',
|
||||
if misc.RunRegex(re.compile('(Link detected: yes|link ok)',
|
||||
re.I | re.M | re.S), tool_data) is not None:
|
||||
return True
|
||||
else:
|
||||
|
||||
Reference in new issue
Block a user