[mono/mono] 75165860: Fix skip_scan to handle proper load errors.
| Newsgroups | gmane.comp.gnome.mono.patches |
|---|---|
| Message-ID | <0000014205aee868-e1b29081-9e2a-49d3-90cb-5c4f0b44a206-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/01abc8bb0702...75165860c452
Commit: 75165860c452bcf52bd46cab1f5f7503584b3b84
Author: Rodrigo Kumpera <[email protected]> (kumpera)
Date: 2013-10-29 19:25:20 GMT
URL: https://github.com/mono/mono/commit/75165860c452bcf52bd46cab1f5f7503584b3b84
Fix skip_scan to handle proper load errors.
Changed paths:
M mcs/tools/mkbundle/mkbundle.cs
Modified: mcs/tools/mkbundle/mkbundle.cs
===================================================================
@@ -626,6 +626,8 @@ static Assembly LoadAssembly (string assembly)
Error ("Cannot find assembly `" + assembly + "'" );
Console.WriteLine ("Log: \n" + total_log);
} catch (IKVM.Reflection.BadImageFormatException f) {
+ if (skip_scan)
+ throw;
Error ("Cannot load assembly (bad file format) " + f.Message);
} catch (FileLoadException f){
Error ("Cannot load assembly " + f.Message);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches