[asterisk-commits] tilghman: trunk r216547 - in /trunk: UPGRADE-1.6.txt main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Sep  4 12:31:44 2009
New Revision: 216547

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=216547
Log:
Enable turning off the application delimiter warning with the 'dontwarn' option.
Suggested on the -dev list, and implemented in an alternate way by me.

Modified:
    trunk/UPGRADE-1.6.txt
    trunk/main/pbx.c

Modified: trunk/UPGRADE-1.6.txt
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/UPGRADE-1.6.txt?view=diff&rev=216547&r1=216546&r2=216547
==============================================================================
--- trunk/UPGRADE-1.6.txt (original)
+++ trunk/UPGRADE-1.6.txt Fri Sep  4 12:31:44 2009
@@ -71,6 +71,12 @@
   You now only need to quote strings in configuration files if you literally
   want quotation marks within a string.
 
+* Any applications run that contain the pipe symbol but not a comma symbol will
+  get a warning printed to the effect that the application delimiter has changed.
+  However, there are legitimate reasons why this might be useful in certain
+  situations, so this warning can be turned off with the dontwarn option in
+  asterisk.conf.
+
 * The logger.conf option 'rotatetimestamp' has been deprecated in favor of
   'rotatestrategy'.  This new option supports a 'rotate' strategy that more
   closely mimics the system logger in terms of file rotation.

Modified: trunk/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/pbx.c?view=diff&rev=216547&r1=216546&r2=216547
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri Sep  4 12:31:44 2009
@@ -1361,7 +1361,7 @@
 	if (app->module)
 		u = __ast_module_user_add(app->module, c);
 	if (strcasecmp(app->name, "system") && !ast_strlen_zero(data) &&
-			strchr(data, '|') && !strchr(data, ',')) {
+			strchr(data, '|') && !strchr(data, ',') && !ast_opt_dont_warn) {
 		ast_log(LOG_WARNING, "The application delimiter is now the comma, not "
 			"the pipe.  Did you forget to convert your dialplan?  (%s(%s))\n",
 			app->name, (char *) data);