[Pkg-voip-commits] [asterisk] 01/01: AST-2013-007: avoid warning on rasterisk

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch wheezy
in repository asterisk.

commit 5f7ae0965f0ee232f6e52e8d38f0f868b4cacae5
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sat Jan 4 01:59:17 2014 +0200

    AST-2013-007: avoid warning on rasterisk
    
    No need to print the live_dangerously warning for asterisk -r[x].
    
    See http://svnview.digium.com/svn/asterisk?view=rev&rev=404861
---
 debian/patches/AST-2013-007 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/patches/AST-2013-007 b/debian/patches/AST-2013-007
index ac6d7ab..e1294a9 100644
--- a/debian/patches/AST-2013-007
+++ b/debian/patches/AST-2013-007
@@ -492,7 +492,7 @@ Review: http://reviewboard.digium.internal/r/432/
  
  	if (ast_opt_override_config) {
  		cfg = ast_config_load2(ast_config_AST_CONFIG_FILE, "" /* core, can't reload */, config_flags);
-@@ -3166,8 +3168,11 @@ static void ast_readconfig(void)
+@@ -3166,8 +3168,13 @@ static void ast_readconfig(void)
  			ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIDE_CONSOLE_CONNECT);
  		} else if (!strcasecmp(v->name, "lockconfdir")) {
  			ast_set2_flag(&ast_options, ast_true(v->value),	AST_OPT_FLAG_LOCK_CONFIG_DIR);
@@ -500,7 +500,9 @@ Review: http://reviewboard.digium.internal/r/432/
 +			live_dangerously = ast_true(v->value);
  		}
  	}
-+	pbx_live_dangerously(live_dangerously);
++	if (!ast_opt_remote) {
++		pbx_live_dangerously(live_dangerously);
++	}
  	for (v = ast_variable_browse(cfg, "compat"); v; v = v->next) {
  		float version;
  		if (sscanf(v->value, "%30f", &version) != 1) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git