[Pkg-voip-commits] r5601 - in /freepbx/trunk/debian/patches: noisy_fail_mod_msg series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Wed Apr 23 17:05:13 2008
New Revision: 5601

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5601
Log:
Give more useful error messages when installing / enabling modules.

Added:
    freepbx/trunk/debian/patches/noisy_fail_mod_msg
Modified:
    freepbx/trunk/debian/patches/series

Added: freepbx/trunk/debian/patches/noisy_fail_mod_msg
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/noisy_fail_mod_msg?rev=5601&op=file
==============================================================================
--- freepbx/trunk/debian/patches/noisy_fail_mod_msg (added)
+++ freepbx/trunk/debian/patches/noisy_fail_mod_msg Wed Apr 23 17:05:13 2008
@@ -1,0 +1,82 @@
+Only print a message if an operation ((un)install, (en|dis)able) fails,
+but include the name of the module in it. This gives nicer error
+messages.
+
+--- freepbx-2.3.1~dfsg.orig/amp_conf/bin/module_admin
++++ freepbx-2.3.1~dfsg/amp_conf/bin/module_admin
+@@ -278,51 +278,51 @@ function doReload() {
+ 
+ function doDisable($modulename, $force) {
+ 	if (is_array($errors = module_disable($modulename, $force))) {
+-		out("The following error(s) occured:");
++		out("Module $modulename disable: The following error(s) occured:");
+ 		out(' - '.implode("\n - ",$errors));
+ 		exit(2);
+ 	} else {
+-		out("Module successfully disabled");
++		#out("Module successfully disabled");
+ 	}
+ }
+ 
+ function doEnable($modulename, $force) {
+ 	if (is_array($errors = module_enable($modulename, $force))) {
+-		out("The following error(s) occured:");
++		out("Module $modulename enable: The following error(s) occured:");
+ 		out(' - '.implode("\n - ",$errors));
+ 		exit(2);
+ 	} else {
+-		out("Module successfully enabled");
++		#out("Module successfully enabled");
+ 	}
+ }
+ 
+ function doInstall($modulename, $force) {
+ 	if (is_array($errors = module_install($modulename, $force))) {
+-		out("The following error(s) occured:");
++		out("Module $modulename install: The following error(s) occured:");
+ 		out(' - '.implode("\n - ",$errors));
+ 		exit(2);
+ 	} else {
+-		out("Module successfully installed");
++		#out("Module successfully installed");
+ 	}
+ }
+ 
+ function doUninstall($modulename, $force) {
+ 	if (is_array($errors = module_uninstall($modulename, $force))) {
+-		out("The following error(s) occured:");
++		out("Module $modulename uninstall: The following error(s) occured:");
+ 		out(' - '.implode("\n - ",$errors));
+ 		exit(2);
+ 	} else {
+-		out("Module successfully uninstalled");
++		#out("Module successfully uninstalled");
+ 	}
+ }
+ 
+ function doDelete($modulename, $force) {
+ 	if (is_array($errors = module_delete($modulename, $force))) {
+-		out("The following error(s) occured:");
++		out("Module $module delete: The following error(s) occured:");
+ 		out(' - '.implode("\n - ",$errors));
+ 		exit(2);
+ 	} else {
+-		out("Module successfully deleted");
++		#out("Module successfully deleted");
+ 	}
+ }
+ 
+@@ -332,11 +332,11 @@ function doDownload($modulename, $force)
+ 	global $modulerepository_path;
+ 
+ 	if (is_array($errors = module_download($modulename, $force, 'download_progress', $modulerepository_path, $modulexml_path))) {
+-		out("The following error(s) occured:");
++		out("$Module $module download: The following error(s) occured:");
+ 		out(' - '.implode("\n - ",$errors));
+ 		exit(2);
+ 	} else {
+-		out("Module successfully downloaded");
++		#out("Module successfully downloaded");
+ 	}
+ }
+ 

Modified: freepbx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/series?rev=5601&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/series (original)
+++ freepbx/trunk/debian/patches/series Wed Apr 23 17:05:13 2008
@@ -14,3 +14,4 @@
 # pending patches, still need to be ported 
 # to freepbx-2.2
 #fix-wierd-email
+noisy_fail_mod_msg