Merge "Fix hacking.py to handle 'cannot import x'"

2013-02-26 06:07:05 +00:00
parent f52c1c55d5 99308d4dd3
commit 032ee13648
1 changed files with 2 additions and 1 deletions
--- a/tools/hacking.py
+++ b/tools/hacking.py
@@ -201,7 +201,8 @@ def nova_import_rules(logical_line):
                # NOTE(vish): the import error might be due
                #             to a missing dependency
                missing = str(exc).split()[-1]
-                if missing != mod.split('.')[-1]:
+                if (missing != mod.split('.')[-1] or
+                        "cannot import" in str(exc)):
                    _missingImport.add(missing)
                    return True
                return False