[asterisk-commits] qwell: branch 1.6.2 r257948 - in /branches/1.6.2: ./ main/indications.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Apr 19 16:50:14 2010
New Revision: 257948

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

........
  r257947 | qwell | 2010-04-19 16:49:30 -0500 (Mon, 19 Apr 2010) | 6 lines
  
  Don't consider a missing indications.conf to be a critical error.
  
  There were many changes in revision 176627 which would avoid the error that a
  missing config would have caused.  Other than this, there are no other config
  files (including asterisk.conf, surprisingly) that are required.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/indications.c

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

Modified: branches/1.6.2/main/indications.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/indications.c?view=diff&rev=257948&r1=257947&r2=257948
==============================================================================
--- branches/1.6.2/main/indications.c (original)
+++ branches/1.6.2/main/indications.c Mon Apr 19 16:50:14 2010
@@ -1039,7 +1039,7 @@
 
 	if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
 		ast_log(LOG_ERROR, "Can't find indications config file %s.\n", config);
-		return -1;
+		return 0;
 	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
 		return 0;
 	}