[Pkg-voip-commits] r3550 - freepbx/trunk/debian/patches

[elcuco-guest at alioth.debian.org]

Author: elcuco-guest
Date: 2007-05-14 13:29:29 +0000 (Mon, 14 May 2007)
New Revision: 3550

Added:
   freepbx/trunk/debian/patches/quiet-retrieve.dpatch
Modified:
   freepbx/trunk/debian/patches/00list
Log:
pretty messages when generating configuration in freepbx


Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list	2007-05-14 12:56:11 UTC (rev 3549)
+++ freepbx/trunk/debian/patches/00list	2007-05-14 13:29:29 UTC (rev 3550)
@@ -2,6 +2,7 @@
 fix-module_admin
 use-conf-defaults
 fix-open-or-die
+quiet-retrieve
 
 # debian/xorcom enhancements
 ast-config-dirs

Added: freepbx/trunk/debian/patches/quiet-retrieve.dpatch
===================================================================
--- freepbx/trunk/debian/patches/quiet-retrieve.dpatch	                        (rev 0)
+++ freepbx/trunk/debian/patches/quiet-retrieve.dpatch	2007-05-14 13:29:29 UTC (rev 3550)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## quiet-retrieve.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: when no address defined for the web root, ask to relod the server, and don't type an empty address. the code has been taken from install_amp
+## DP: comited upstream at 3981, to be removed for 2.2.2
+
+ at DPATCH@
+diff -urNad upstream~/amp_conf/bin/retrieve_conf upstream/amp_conf/bin/retrieve_conf
+--- upstream~/amp_conf/bin/retrieve_conf	2007-01-04 02:48:29.000000000 +0200
++++ upstream/amp_conf/bin/retrieve_conf	2007-05-14 16:15:19.000000000 +0300
+@@ -431,5 +431,14 @@
+ 	
+ // **** Set reload flag for AMP admin
+ needreload();
+-out("Please Reload Asterisk by visiting http://".$amp_conf["AMPWEBADDRESS"]."/admin");
++if ($amp_conf["AMPWEBADDRESS"])
++{
++        out("Please update your modules and reload Asterisk by visiting http://".$amp_conf["AMPWEBADDRESS"]."/admin");
++}
++else
++{
++        out("Please update your modules and reload Asterisk by browsing to your server.");
++}
++
++
+ ?>


Property changes on: freepbx/trunk/debian/patches/quiet-retrieve.dpatch
___________________________________________________________________
Name: svn:executable
   + *