[asterisk-commits] lmadsen: branch 1.8 r317104 - in /branches/1.8: ./ contrib/scripts/safe_asterisk

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Thu May  5 10:04:24 2011
New Revision: 317104

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317104
Log:
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:
    branches/1.8/   (props changed)
    branches/1.8/contrib/scripts/safe_asterisk

Propchange: branches/1.8/
            ('branch-1.6.2-blocked' removed)

Propchange: branches/1.8/
            ('branch-1.6.2-merged' removed)

Modified: branches/1.8/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/contrib/scripts/safe_asterisk?view=diff&rev=317104&r1=317103&r2=317104
==============================================================================
--- branches/1.8/contrib/scripts/safe_asterisk (original)
+++ branches/1.8/contrib/scripts/safe_asterisk Thu May  5 10:04:24 2011
@@ -45,7 +45,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