[asterisk-commits] mnicholson: branch 1.6.2 r275191 - in /branches/1.6.2: ./ main/loader.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Jul  9 13:24:45 2010
New Revision: 275191

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

................
  r275186 | mnicholson | 2010-07-09 13:24:03 -0500 (Fri, 09 Jul 2010) | 9 lines
  
  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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/loader.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/loader.c?view=diff&rev=275191&r1=275190&r2=275191
==============================================================================
--- branches/1.6.2/main/loader.c (original)
+++ branches/1.6.2/main/loader.c Fri Jul  9 13:24:45 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)