From ecd58e392469c1fb7df504114e54a8f89aa10b7e Mon Sep 17 00:00:00 2001 From: Shyotl Date: Tue, 23 Dec 2014 20:00:01 -0600 Subject: [PATCH] Reduce some diagnostic spam. --- indra/lib/python/indra/util/llmanifest.py | 1 - indra/newview/viewer_manifest.py | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 8b8ed825d..0059faa2e 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -642,7 +642,6 @@ class LLManifest(object): os.path.normpath(os.path.join(self.get_alt_build_prefix(), src))] ) for path in paths: - print path if self.wildcard_pattern.search(path): is_glob = True for s,d in self.expand_globs(path, dst): diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2c053c312..fa9a8cdb5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -197,12 +197,14 @@ class ViewerManifest(LLManifest): def add_extra_libraries(self): found_libs = [] - if 'extra_libraries' in self.args: + if 'extra_libraries' in self.args and self.args['extra_libraries'] != '': try: path_list = self.args['extra_libraries'].strip('"').split('|') except: return None for cur_path in path_list: + if cur_path is None or cur_path == '': + continue try: config, file = cur_path.split(' ', 1) except: @@ -215,7 +217,7 @@ class ViewerManifest(LLManifest): if(self.args['configuration'].lower() != 'debug'): continue cur_path = file - if(cur_path != None): + if(cur_path != ''): found_libs += self.path_optional(cur_path) return found_libs