[asterisk-commits] tilghman: branch 1.4 r80747 - in /branches/1.4: UPGRADE.txt main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Aug 24 10:41:43 2007
New Revision: 80747

URL: http://svn.digium.com/view/asterisk?view=rev&rev=80747
Log:
Make the deprecation warning inline with the code, instead of only in documentation (closes issue #10549)

Modified:
    branches/1.4/UPGRADE.txt
    branches/1.4/main/pbx.c

Modified: branches/1.4/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/branches/1.4/UPGRADE.txt?view=diff&rev=80747&r1=80746&r2=80747
==============================================================================
--- branches/1.4/UPGRADE.txt (original)
+++ branches/1.4/UPGRADE.txt Fri Aug 24 10:41:43 2007
@@ -130,7 +130,9 @@
   interpolation falling back to globals when no channel variable is set.
 
 * The application SetVar has been renamed to Set.  The syntax SetVar was marked
-  deprecated in version 1.2 and is no longer recognized in this version.
+  deprecated in version 1.2 and is no longer recognized in this version.  The
+  use of Set with multiple argument pairs has also been deprecated.  Please
+  separate each name/value pair into its own dialplan line.
 
 * app_read has been updated to use the newer options codes, using "skip" or
   "noanswer" will not work.  Use s or n.  Also there is a new feature i, for

Modified: branches/1.4/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/pbx.c?view=diff&rev=80747&r1=80746&r2=80747
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Fri Aug 24 10:41:43 2007
@@ -5857,9 +5857,14 @@
 	/* check for a trailing flags argument */
 	if ((argc > 1) && !strchr(argv[argc-1], '=')) {
 		argc--;
-		if (strchr(argv[argc], 'g'))
+		if (strchr(argv[argc], 'g')) {
+			ast_log(LOG_WARNING, "The use of the 'g' flag is deprecated.  Please use Set(GLOBAL(foo)=bar) instead\n");
 			global = 1;
-	}
+		}
+	}
+
+	if (argc > 1)
+		ast_log(LOG_WARNING, "Setting multiple variables at once within Set is deprecated.  Please separate each name/value pair into its own line.\n");
 
 	for (x = 0; x < argc; x++) {
 		name = argv[x];