[Initscripts-ng-commits] r780 - in /branches/insserv-1.11.9/debian: changelog patches/82_improve_runlevel_override_output.patch patches/series run-testsuite

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Jul 15 02:40:43 2008
New Revision: 780

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=780
Log:
* Make test_adding_start() and test_adding_stop() run-testsuite
  functions unconditionally fatal on failure.
* Add 82_improve_runlevel_override_output.patch to improve output when
  overriding defaults with existing start|stop runlevel link
  configuration.

Added:
    branches/insserv-1.11.9/debian/patches/82_improve_runlevel_override_output.patch
Modified:
    branches/insserv-1.11.9/debian/changelog
    branches/insserv-1.11.9/debian/patches/series
    branches/insserv-1.11.9/debian/run-testsuite

Modified: branches/insserv-1.11.9/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/changelog?rev=780&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/changelog (original)
+++ branches/insserv-1.11.9/debian/changelog Tue Jul 15 02:40:43 2008
@@ -39,8 +39,13 @@
   * Refresh 31_debian_conf.patch.
   * Add an extra call to list_rclinks() in test_newbug_keepoldorder()
     function of run-testsuite, after introducing the bug.
-
- -- Kel Modderman <kel at otaku42.de>  Tue, 15 Jul 2008 11:55:07 +1000
+  * Make test_adding_start() and test_adding_stop() run-testsuite
+    functions unconditionally fatal on failure.
+  * Add 82_improve_runlevel_override_output.patch to improve output when
+    overriding defaults with existing start|stop runlevel link
+    configuration.
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 15 Jul 2008 12:40:20 +1000
 
 insserv (1.11.0-9) unstable; urgency=low
 

Added: branches/insserv-1.11.9/debian/patches/82_improve_runlevel_override_output.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/82_improve_runlevel_override_output.patch?rev=780&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/82_improve_runlevel_override_output.patch (added)
+++ branches/insserv-1.11.9/debian/patches/82_improve_runlevel_override_output.patch Tue Jul 15 02:40:43 2008
@@ -1,0 +1,30 @@
+Improve message when current link scheme overrides defaults. Use string "empty"
+when script is active but without start|stop links. Enclose lvl2str generated
+string in round brackets.
+---
+--- a/insserv.c
++++ b/insserv.c
+@@ -2779,8 +2779,9 @@
+ 			     */
+ 			    if (!defaults && (deflvls != service->start->lvl)) {
+ 				if (!del && chkfor(d->d_name, argv, argc) && !(argr[curr_argc]))
+-				    warn("Warning, current start runlevel(s) %s of script `%s' overwrites defaults %s.\n",
+-					 lvl2str(service->start->lvl), d->d_name, lvl2str(deflvls));
++				    warn("Warning, current start runlevel(s) (%s) of script `%s' overwrites defaults (%s).\n",
++					 service->start->lvl ? lvl2str(service->start->lvl) : "empty", d->d_name,
++					 lvl2str(deflvls));
+ 			    }
+ 			} else
+ 			    /*
+@@ -2824,8 +2825,9 @@
+ 			     */
+ 			    if (!defaults && (deflvlk != service->stopp->lvl)) {
+ 				if (!del && chkfor(d->d_name, argv, argc) && !(argr[curr_argc]))
+-				    warn("Warning, current stop runlevel(s) %s of script `%s' overwrites defaults %s.\n",
+-					 lvl2str(service->stopp->lvl), d->d_name, lvl2str(deflvlk));
++				    warn("Warning, current stop runlevel(s) (%s) of script `%s' overwrites defaults (%s).\n",
++					 service->stopp->lvl ? lvl2str(service->stopp->lvl) : "empty", d->d_name,
++					 lvl2str(deflvlk));
+ 			    }
+ 			} else
+ 			    /*

Modified: branches/insserv-1.11.9/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/series?rev=780&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/series (original)
+++ branches/insserv-1.11.9/debian/patches/series Tue Jul 15 02:40:43 2008
@@ -8,3 +8,4 @@
 70_test_suite_failed_count.patch
 80_do_not_mangle_argv_pointer.patch
 81_empty_stop_start_defaults_no_override.patch
+82_improve_runlevel_override_output.patch

Modified: branches/insserv-1.11.9/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/run-testsuite?rev=780&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/run-testsuite (original)
+++ branches/insserv-1.11.9/debian/run-testsuite Tue Jul 15 02:40:43 2008
@@ -1013,7 +1013,7 @@
 check_script_present 0 addstartscript
 
 check_script_not_present S addstartscript
-${severity}_script_not_present 1 addstartscript
+check_script_not_present 1 addstartscript
 check_script_not_present 2 addstartscript
 check_script_not_present 3 addstartscript
 check_script_not_present 4 addstartscript
@@ -1067,7 +1067,7 @@
 list_rclinks
 
 check_script_present S addstopscript
-${severity}_script_not_present 0 addstopscript
+check_script_not_present 0 addstopscript
 check_script_not_present 1 addstopscript
 check_script_not_present 2 addstopscript
 check_script_not_present 3 addstopscript