[svn-commits] qwell: branch 1.6.2 r307535 - in /branches/1.6.2: ./ contrib/init.d/ main/

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Feb 10 16:35:49 2011
New Revision: 307535

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

........
  r307534 | qwell | 2011-02-10 16:33:09 -0600 (Thu, 10 Feb 2011) | 8 lines
  
  Remove color when executing commands via a remote console.
  
  Essentially this makes '-x' imply '-n' on rasterisk.  This was done in a
  different and incomplete way previously, which I'm reverting here.
  
  (issue #18776)
  Reported by: alecdavis
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/contrib/init.d/rc.debian.asterisk
    branches/1.6.2/main/asterisk.c

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

Modified: branches/1.6.2/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/contrib/init.d/rc.debian.asterisk?view=diff&rev=307535&r1=307534&r2=307535
==============================================================================
--- branches/1.6.2/contrib/init.d/rc.debian.asterisk (original)
+++ branches/1.6.2/contrib/init.d/rc.debian.asterisk Thu Feb 10 16:35:49 2011
@@ -72,7 +72,7 @@
   start)
 	# Check if Asterisk is already running.  If it is, then bug out, because
 	# starting up Asterisk when Asterisk is already running is very bad.
-	VERSION=`${DAEMON} -rnx 'core show version' || ${TRUE}`
+	VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
 	if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
 		echo "Asterisk is already running.  $0 will exit now."
 		exit 1

Modified: branches/1.6.2/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/asterisk.c?view=diff&rev=307535&r1=307534&r2=307535
==============================================================================
--- branches/1.6.2/main/asterisk.c (original)
+++ branches/1.6.2/main/asterisk.c Thu Feb 10 16:35:49 2011
@@ -3250,7 +3250,7 @@
 			ast_set_flag(&ast_options, AST_OPT_FLAG_TIMESTAMP);
 			break;
 		case 'x':
-			ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC);
+			ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC | AST_OPT_FLAG_NO_COLOR);
 			xarg = ast_strdupa(optarg);
 			break;
 		case 'C':