[svn-commits] lmadsen: trunk r317105 - in /trunk: ./ contrib/scripts/safe_asterisk

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Thu May  5 10:06:59 2011
New Revision: 317105

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

................
  r317104 | lmadsen | 2011-05-05 11:04:24 -0400 (Thu, 05 May 2011) | 15 lines
  
  Merged revisions 317102 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r317102 | lmadsen | 2011-05-05 10:54:46 -0400 (Thu, 05 May 2011) | 8 lines
    
    Disable console colourization inside safe_asterisk checks.
    
    (closes issue #19213)
    Reported by: lefoyer
    Patches: 
          issue19213_strip_color_in_safe_asterisk-svn.patch uploaded by wdoekes (license 717)
    Tested by: wdoekes, lefoyer
  ........
................

Modified:
    trunk/   (props changed)
    trunk/contrib/scripts/safe_asterisk

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/safe_asterisk?view=diff&rev=317105&r1=317104&r2=317105
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Thu May  5 10:06:59 2011
@@ -47,7 +47,7 @@
 
 # Check if Asterisk is already running.  If it is, then bug out, because
 # starting safe_asterisk when Asterisk is running is very bad.
-VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
+VERSION=`${ASTSBINDIR}/asterisk -nrx 'core show version'`
 if test "`echo $VERSION | cut -c 1-8`" = "Asterisk" ; then
 	message "Asterisk is already running.  $0 will exit now."
 	exit 1