From 4bbca7c086724da1af4f8cb6b22e6de8320a0b1b Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Tue, 8 Jun 2010 11:01:44 -0700
Subject: [PATCH] Fix for false positive in error checking symbol file
generation on windows (MissingModuleError).
---
indra/newview/generate_breakpad_symbols.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/indra/newview/generate_breakpad_symbols.py b/indra/newview/generate_breakpad_symbols.py
index d94301d62e5..1f42004bb7a 100644
--- a/indra/newview/generate_breakpad_symbols.py
+++ b/indra/newview/generate_breakpad_symbols.py
@@ -109,12 +109,17 @@ def dump_module(m):
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])
--
GitLab