From 292aecbb3e14658c470978efeb7cd790ec156fd2 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Wed, 30 Sep 2009 18:57:00 -0700 Subject: Updated test_win32_manifest.py to throw custom exception objects, rather than relying on string comparison. --- indra/newview/viewer_manifest.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 579bfaa4d9..bda81a505d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -187,6 +187,7 @@ class WindowsManifest(ViewerManifest): # This is used to test that no manifest for the msvcrt exists. # It is used as a temporary override during the construct method from test_win32_manifest import test_assembly_binding + from test_win32_manifest import NoManifestException, NoMatchingAssemblyException if src and (os.path.exists(src) or os.path.islink(src)): # ensure that destination path exists self.cmakedirs(os.path.dirname(dst)) @@ -198,9 +199,10 @@ class WindowsManifest(ViewerManifest): else: test_assembly_binding(src, "Microsoft.VC80.CRT", "") raise Exception("Unknown condition") - except Exception, err: - if err.message != "No matching assembly" or err.message != "No manifest found": - raise Exception("Found unexpected MSVCRT manifest binding") + except NoManifestException, err: + pass + except NoMatchingAssemblyException, err: + pass self.ccopy(src,dst) else: -- cgit v1.2.3