[svn-commits] mnicholson: trunk r275186 - in /trunk: ./ main/loader.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Fri Jul  9 13:24:03 2010
New Revision: 275186

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275186
Log:
Merged revisions 275182 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r275182 | mnicholson | 2010-07-09 13:23:23 -0500 (Fri, 09 Jul 2010) | 2 lines
  
  give a better error message when attempting to unload a module that is not loaded
........

Modified:
    trunk/   (props changed)
    trunk/main/loader.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/loader.c?view=diff&rev=275186&r1=275185&r2=275186
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Fri Jul  9 13:24:03 2010
@@ -494,8 +494,10 @@
 		return -1;
 	}
 
-	if (!mod->flags.running || mod->flags.declined)
+	if (!mod->flags.running || mod->flags.declined) {
+		ast_log(LOG_WARNING, "Unload failed, '%s' is not loaded.\n", resource_name);
 		error = 1;
+	}
 
 	if (!error && (mod->usecount > 0)) {
 		if (force)