Author: kelmo-guest
Date: Sun Apr 22 09:57:09 2012
New Revision: 1077
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1077
Log:
* Use "overrides" instead of "overwrites" and define defaults as "LSB
defaults" when emitting warnings. (Closes: #668559)
* Remove upstart jobs created by test_insserv_upstart at end of test.
* Remove config snippets made by test_local_virtual at end of test.
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/21_tweak_warnings.patch
trunk/src/insserv/debian/run-testsuite
Modified: trunk/src/insserv/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1077&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Apr 22 09:57:09 2012
@@ -1,3 +1,12 @@
+insserv (1.14.0-4) unstable; urgency=low
+
+ * Use "overrides" instead of "overwrites" and define defaults as "LSB
+ defaults" when emitting warnings. (Closes: #668559)
+ * Remove upstart jobs created by test_insserv_upstart at end of test.
+ * Remove config snippets made by test_local_virtual at end of test.
+
+ -- Kel Modderman <[email protected]> Sun, 22 Apr 2012 19:56:42 +1000
+
insserv (1.14.0-3) unstable; urgency=low
* Acknowledge NMUs, thanks Christian & Luk.
Modified: trunk/src/insserv/debian/patches/21_tweak_warnings.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/21_tweak_warnings.patch?rev=1077&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/21_tweak_warnings.patch (original)
+++ trunk/src/insserv/debian/patches/21_tweak_warnings.patch Sun Apr 22
09:57:09 2012
@@ -1,9 +1,20 @@
Description: only emit warnings about overriding LSB default with symlink
- state for the scripts in insserv arg list.
+ state for the scripts in insserv arg list. Use "overrides" instead of
+ "overwrites" and define defaults as "LSB defaults".
From: Kel Modderman <[email protected]>
+Bug-Debian: bugs.debian.org/668559
---
--- a/insserv.c
+++ b/insserv.c
+@@ -3081,7 +3081,7 @@ int main (int argc, char *argv[])
+ */
+ if (!defaults && (deflvls != service->start->lvl)) {
+ if (!del && isarg && !(argr[curr_argc]))
+- warn("warning: current start runlevel(s)
(%s) of script `%s' overwrites defaults (%s).\n",
++ warn("warning: current start runlevel(s)
(%s) of script `%s' overrides LSB defaults (%s).\n",
+ service->start->lvl ?
lvl2str(service->start->lvl) : "empty", d->d_name, lvl2str(deflvls));
+ }
+ } else
@@ -3100,8 +3100,9 @@ int main (int argc, char *argv[])
* of the current script.
*/
@@ -11,11 +22,20 @@
- warn("warning: current start runlevel(s) (%s)
of script `%s' overwrites defaults (empty).\n",
- lvl2str(service->start->lvl), d->d_name);
+ if (!del && isarg && !(argr[curr_argc]))
-+ warn("warning: current start runlevel(s)
(%s) of script `%s' overwrites defaults (empty).\n",
++ warn("warning: current start runlevel(s)
(%s) of script `%s' overrides LSB defaults (empty).\n",
+ lvl2str(service->start->lvl),
d->d_name);
script_inf.default_start =
lvl2str(service->start->lvl);
}
}
+@@ -3143,7 +3144,7 @@ int main (int argc, char *argv[])
+ */
+ if (!defaults && (deflvlk != service->stopp->lvl)) {
+ if (!del && isarg && !(argr[curr_argc]))
+- warn("warning: current stop runlevel(s)
(%s) of script `%s' overwrites defaults (%s).\n",
++ warn("warning: current stop runlevel(s)
(%s) of script `%s' overrides LSB defaults (%s).\n",
+ service->stopp->lvl ?
lvl2str(service->stopp->lvl) : "empty", d->d_name, lvl2str(deflvlk));
+ }
+ } else
@@ -3162,8 +3163,9 @@ int main (int argc, char *argv[])
* of the current script.
*/
@@ -23,7 +43,7 @@
- warn("warning: current stop runlevel(s) (%s) of
script `%s' overwrites defaults (empty).\n",
- lvl2str(service->stopp->lvl), d->d_name);
+ if (!del && isarg && !(argr[curr_argc]))
-+ warn("warning: current stop runlevel(s)
(%s) of script `%s' overwrites defaults (empty).\n",
++ warn("warning: current stop runlevel(s)
(%s) of script `%s' overrides LSB defaults (empty).\n",
+ lvl2str(service->stopp->lvl),
d->d_name);
script_inf.default_stop =
lvl2str(service->stopp->lvl);
}
Modified: trunk/src/insserv/debian/run-testsuite
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=1077&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sun Apr 22 09:57:09 2012
@@ -2077,6 +2077,7 @@
check_order 1 test4 test1
check_order 1 test4 test2
+rm -f $insconf.d/test3 $insconf.d/test4
}
##########################################################################
test_insserv_upstart() {
@@ -2122,6 +2123,10 @@
insserv_reg $name
}
+remove_upstart_jobs() {
+ rm -rf $upstartdir
+}
+
# XXX Someone that understand upstart need to fill in sensible stuff
# here
insert_upstart_job upstart-test <<EOF || true
@@ -2143,6 +2148,7 @@
# Undo upstart config
insconf="$oldconf"
+remove_upstart_jobs
}
##########################################################################
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/initscripts-ng-commits
