Skip to content

Commit

Permalink
2004-09-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>
Browse files Browse the repository at this point in the history
	* assembly.c: provide more information when loading an assembly fails.

svn path=/branches/mono-1-0/mono/; revision=33362
  • Loading branch information
gonzalop committed Sep 5, 2004
1 parent 05fb52c commit e51d417
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
4 changes: 4 additions & 0 deletions mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
2004-09-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* assembly.c: provide more information when loading an assembly fails.

2004-09-04 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* filewatcher.c: don't expect the development fam package to be
Expand Down
14 changes: 12 additions & 2 deletions mono/metadata/assembly.c
Expand Up @@ -388,6 +388,15 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)
image->name, aname.name);

} else {
char *extra_msg = g_strdup ("");

if (*status == MONO_IMAGE_ERROR_ERRNO) {
extra_msg = g_strdup_printf ("System error: %s\n", strerror (errno));
} else if (*status == MONO_IMAGE_MISSING_ASSEMBLYREF) {
extra_msg = g_strdup ("Cannot find an assembly referenced from this one.\n");
} else if (*status == MONO_IMAGE_IMAGE_INVALID) {
extra_msg = g_strdup ("The file exists but is not a valid assembly.\n");
}

for (j = 0; j < i; j++)
mono_assembly_close (references [j]);
Expand All @@ -396,11 +405,12 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)
g_warning ("Could not find assembly %s, references from %s (assemblyref_index=%d)\n"
" Major/Minor: %d,%d\n"
" Build: %d,%d\n"
" Token: %s\n",
" Token: %s\n%s",
aname.name, image->name, i,
aname.major, aname.minor, aname.build, aname.revision,
aname.public_key_token);
aname.public_key_token, extra_msg);
*status = MONO_IMAGE_MISSING_ASSEMBLYREF;
g_free (extra_msg);
return;
}
}
Expand Down

0 comments on commit e51d417

Please sign in to comment.