diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-06-08 11:01:44 -0700 | 
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-06-08 11:01:44 -0700 | 
| commit | 4bbca7c086724da1af4f8cb6b22e6de8320a0b1b (patch) | |
| tree | 91b4c5856ba4ed9d59c1b2019b6e4c2c9d0887d8 | |
| parent | 185cd5d261a4bc6e02f49f40c72d76da4320a881 (diff) | |
Fix for false positive in error checking symbol file generation on windows (MissingModuleError).
| -rw-r--r-- | indra/newview/generate_breakpad_symbols.py | 13 | 
1 files changed, 9 insertions, 4 deletions
| diff --git a/indra/newview/generate_breakpad_symbols.py b/indra/newview/generate_breakpad_symbols.py index d94301d62e..1f42004bb7 100644 --- a/indra/newview/generate_breakpad_symbols.py +++ b/indra/newview/generate_breakpad_symbols.py @@ -109,12 +109,17 @@ def main(viewer_dir, viewer_exes, libs_suffix, dump_syms_tool, viewer_symbol_fil      symbols = tarfile.open(viewer_symbol_file, 'r:bz2')      tarfile_members = symbols.getnames() -    def match_module_basename(m): -        return os.path.splitext(required_module)[0] == os.path.splitext(os.path.basename(m))[0] +    symbols.close() +      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)): -            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)              raise MissingModuleError([required_module]) | 
