Skip to content
Snippets Groups Projects
Commit 4bbca7c0 authored by brad kittenbrink's avatar brad kittenbrink
Browse files

Fix for false positive in error checking symbol file generation on windows (MissingModuleError).

parent 185cd5d2
No related branches found
No related tags found
No related merge requests found
...@@ -109,12 +109,17 @@ def dump_module(m): ...@@ -109,12 +109,17 @@ def dump_module(m):
symbols = tarfile.open(viewer_symbol_file, 'r:bz2') symbols = tarfile.open(viewer_symbol_file, 'r:bz2')
tarfile_members = symbols.getnames() tarfile_members = symbols.getnames()
def match_module_basename(m): symbols.close()
return os.path.splitext(required_module)[0] == os.path.splitext(os.path.basename(m))[0]
for required_module in viewer_exes: for required_module in viewer_exes:
# there must be at least one .sym file in tarfile_members that matches each required module (ignoring file extensions) def match_module_basename(m):
return os.path.splitext(required_module)[0].lower() \
== os.path.splitext(os.path.basename(m))[0].lower()
# there must be at least one .sym file in tarfile_members that matches
# each required module (ignoring file extensions)
if not reduce(operator.or_, itertools.imap(match_module_basename, tarfile_members)): if not reduce(operator.or_, itertools.imap(match_module_basename, tarfile_members)):
print >> sys.stderr, "failed to find required %s in generated %s" % (required_module, viewer_symbol_file) print >> sys.stderr, "failed to find required %s in generated %s" \
% (required_module, viewer_symbol_file)
os.remove(viewer_symbol_file) os.remove(viewer_symbol_file)
raise MissingModuleError([required_module]) raise MissingModuleError([required_module])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment