Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2016-11-25 14:40:49 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2016-11-25 19:08:49 +0300
commitb89ab049a02e7c51cd86d8e3c33791604d08e24d (patch)
treeba1b87a7b3dbb37a8152d0e5ad265dc38cb1dae1
parent5dfd0f380206d2ea29df5bb708a9bc6f557a7c52 (diff)
[mkbundle] Print error message when assemblies couldn't be loaded
There were two places in mkbundle where it'd simply exit without printing anything, leading to confusion such as in https://bugzilla.xamarin.com/show_bug.cgi?id=46479. (cherry picked from commit cea5f28d2cd76085e9e36ac253b333ad4ddb6fef)
-rwxr-xr-xmcs/tools/mkbundle/mkbundle.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs
index 1ea1d740245..3351fd24d0b 100755
--- a/mcs/tools/mkbundle/mkbundle.cs
+++ b/mcs/tools/mkbundle/mkbundle.cs
@@ -1071,9 +1071,11 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
}
}
- if (error)
+ if (error) {
+ Error ("Couldn't load one or more of the assemblies.");
Environment.Exit (1);
-
+ }
+
return assemblies;
}
@@ -1103,8 +1105,10 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
}
}
- if (error)
+ if (error) {
+ Error ("Couldn't load one or more of the i18n assemblies.");
Environment.Exit (1);
+ }
}