Improve tracing output for loaded assemblies from bundles.

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 459602bcfc58e34e1886401bf227c652f2c943bc..81542db928208d5db7ba088d23e76d50fbd9c94a 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -1474,6 +1474,7 @@ mono_assembly_open_from_bundle (const char *filename, MonoImageOpenStatus *statu
        g_free (name);
        if (image) {
                mono_image_addref (image);
+               mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly Loader loaded assembly from bundle: '%s'.", filename);
                return image;
        }
        return NULL;
@@ -1487,6 +1488,7 @@ mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboo
        MonoImageOpenStatus def_status;
        gchar *fname;
        gchar *new_fname;
+       gboolean loaded_from_bundle;
        
        g_return_val_if_fail (filename != NULL, NULL);
 
@@ -1538,8 +1540,11 @@ mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboo
        
        image = NULL;
 
-       if (bundles != NULL)
+       loaded_from_bundle = FALSE;
+       if (bundles != NULL) {
                image = mono_assembly_open_from_bundle (fname, status, refonly);
+               loaded_from_bundle = image != NULL;
+       }
 
        if (!image)
                image = mono_image_open_full (fname, status, refonly);
@@ -1562,7 +1567,8 @@ mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboo
        ass = mono_assembly_load_from_full (image, fname, status, refonly);
 
        if (ass) {
-               mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
+               if (!loaded_from_bundle)
+                       mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
                                "Assembly Loader loaded assembly from location: '%s'.", filename);
                if (!refonly)
                        mono_config_for_assembly (ass->image);