[debhelper-devel] [debhelper] 03/05: Introduce --no-stop-on-upgrade as alias of -r
Niels Thykier
nthykier at moszumanska.debian.org
Sun Oct 2 06:24:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit 75fe3f9a91438ec6ed6dbee42fac56213ed32eb7
Author: Niels Thykier <niels at thykier.net>
Date: Sun Oct 2 06:05:10 2016 +0000
Introduce --no-stop-on-upgrade as alias of -r
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debian/changelog | 5 +++++
dh_installinit | 3 ++-
dh_systemd_start | 5 +++--
man/po4a/po/de.po | 8 ++++----
man/po4a/po/es.po | 6 +++---
man/po4a/po/fr.po | 8 ++++----
man/po4a/po/pt.po | 8 ++++----
7 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8a1b490..a6aeafa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ debhelper (10.2) UNRELEASED; urgency=medium
* Apply patch from Michael Biebl to undo a major
regression where all of debhelpers functionality was
missing (introduced in 10.1). (Closes: #839557)
+ * dh_installinit,dh_systemd_start: Introduce a new
+ --no-stop-on-upgrade as an alternative to
+ --no-restart-on-upgrade. This new option should be
+ reduce the confusion of what it does. Thanks to
+ Michael Biebl for the suggestion.
-- Niels Thykier <niels at thykier.net> Sun, 02 Oct 2016 05:50:21 +0000
diff --git a/dh_installinit b/dh_installinit
index f5c96dc..a79113a 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -101,7 +101,7 @@ Undo a previous B<--restart-after-upgrade> (or the default of compat
stopped in the F<prerm> script and started again in the F<postinst>
script.
-=item B<-r>, B<--no-restart-on-upgrade>
+=item B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>
Do not stop init script on upgrade.
@@ -168,6 +168,7 @@ $dh{RESTART_AFTER_UPGRADE} = 1 if not compat(9);
init(options => {
"r" => \$dh{R_FLAG},
+ 'no-stop-on-upgrade' => \$dh{R_FLAG},
"no-restart-on-upgrade" => \$dh{R_FLAG},
"no-start" => \$dh{NO_START},
"R|restart-after-upgrade!" => \$dh{RESTART_AFTER_UPGRADE},
diff --git a/dh_systemd_start b/dh_systemd_start
index 9914bbd..6cee5c0 100755
--- a/dh_systemd_start
+++ b/dh_systemd_start
@@ -13,7 +13,7 @@ use Cwd qw(getcwd abs_path);
=head1 SYNOPSIS
-B<dh_systemd_start> [S<I<debhelper options>>] [B<--restart-after-upgrade>] [B<--no-restart-on-upgrade>] [S<I<unit file> ...>]
+B<dh_systemd_start> [S<I<debhelper options>>] [B<--restart-after-upgrade>] [B<--no-stop-on-upgrade>] [S<I<unit file> ...>]
=head1 DESCRIPTION
@@ -51,7 +51,7 @@ Undo a previous B<--restart-after-upgrade> (or the default of compat
stopped in the F<prerm> script and started again in the F<postinst>
script.
-=item B<-r>, B<--no-restart-on-upgrade>
+=item B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>
Do not stop service on upgrade.
@@ -80,6 +80,7 @@ $dh{RESTART_AFTER_UPGRADE} = 1 if not compat(9);
init(options => {
"r" => \$dh{R_FLAG},
+ 'no-stop-on-upgrade' => \$dh{R_FLAG},
"no-restart-on-upgrade" => \$dh{R_FLAG},
"no-start" => \$dh{NO_START},
"R|restart-after-upgrade!" => \$dh{RESTART_AFTER_UPGRADE},
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index dd798ae..8fa6a41 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -5928,8 +5928,8 @@ msgstr ""
#. type: =item
#: dh_installinit:104 dh_systemd_start:54
-msgid "B<-r>, B<--no-restart-on-upgrade>"
-msgstr "B<-r>, B<--no-restart-on-upgrade>"
+msgid "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
+msgstr "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
#. type: textblock
#: dh_installinit:106
@@ -8535,10 +8535,10 @@ msgstr ""
#: dh_systemd_start:16
msgid ""
"B<dh_systemd_start> [S<I<debhelper options>>] [B<--restart-after-upgrade>] "
-"[B<--no-restart-on-upgrade>] [S<I<unit file> ...>]"
+"[B<--no-stop-on-upgrade>] [S<I<unit file> ...>]"
msgstr ""
"B<dh_systemd_start> [S<I<Debhelper-Optionen>>] [B<--restart-after-upgrade>] "
-"[B<--no-restart-on-upgrade>] [S<I<Unit-Datei> …>]"
+"[B<--no-stop-on-upgrade>] [S<I<Unit-Datei> …>]"
#. type: textblock
#: dh_systemd_start:20
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 3cd22c0..e4dc0d1 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -6257,8 +6257,8 @@ msgstr ""
# type: =item
#. type: =item
#: dh_installinit:104 dh_systemd_start:54
-msgid "B<-r>, B<--no-restart-on-upgrade>"
-msgstr "B<-r>, B<--no-restart-on-upgrade>"
+msgid "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
+msgstr "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
# type: textblock
#. type: textblock
@@ -9117,7 +9117,7 @@ msgstr ""
#| "[S<I<file> ...>]"
msgid ""
"B<dh_systemd_start> [S<I<debhelper options>>] [B<--restart-after-upgrade>] "
-"[B<--no-restart-on-upgrade>] [S<I<unit file> ...>]"
+"[B<--no-stop-on-upgrade>] [S<I<unit file> ...>]"
msgstr ""
"B<dh_installdocs> [S<I<opciones-de-debhelper>>] [B<-A>] [B<-X>I<elemento>] "
"[S<I<fichero> ...>]"
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 2981e3d..92dff15 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -6449,8 +6449,8 @@ msgstr ""
# type: =item
#. type: =item
#: dh_installinit:104 dh_systemd_start:54
-msgid "B<-r>, B<--no-restart-on-upgrade>"
-msgstr "B<-r>, B<--no-restart-on-upgrade>"
+msgid "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
+msgstr "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
# type: textblock
#. type: textblock
@@ -9369,10 +9369,10 @@ msgstr ""
#: dh_systemd_start:16
msgid ""
"B<dh_systemd_start> [S<I<debhelper options>>] [B<--restart-after-upgrade>] "
-"[B<--no-restart-on-upgrade>] [S<I<unit file> ...>]"
+"[B<--no-stop-on-upgrade>] [S<I<unit file> ...>]"
msgstr ""
"B<dh_systemd_start> [S<I<options_de_debhelper>>] [B<--restart-after-"
-"upgrade>] [B<--no-restart-on-upgrade>] [S<I<fichier_unit> ...>]"
+"upgrade>] [B<--no-stop-on-upgrade>] [S<I<fichier_unit> ...>]"
# type: textblock
#. type: textblock
diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po
index b09ea1d..f4ceaf0 100644
--- a/man/po4a/po/pt.po
+++ b/man/po4a/po/pt.po
@@ -5868,8 +5868,8 @@ msgstr ""
#. type: =item
#: dh_installinit:104 dh_systemd_start:54
-msgid "B<-r>, B<--no-restart-on-upgrade>"
-msgstr "B<-r>, B<--no-restart-on-upgrade>"
+msgid "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
+msgstr "B<-r>, B<--no-stop-on-upgrade>, B<--no-restart-on-upgrade>"
#. type: textblock
#: dh_installinit:106
@@ -8466,10 +8466,10 @@ msgstr ""
#: dh_systemd_start:16
msgid ""
"B<dh_systemd_start> [S<I<debhelper options>>] [B<--restart-after-upgrade>] "
-"[B<--no-restart-on-upgrade>] [S<I<unit file> ...>]"
+"[B<--no-stop-on-upgrade>] [S<I<unit file> ...>]"
msgstr ""
"B<dh_systemd_start> [S<I<debhelper options>>] [B<--restart-after-upgrade>] "
-"[B<--no-restart-on-upgrade>] [S<I<unit file> ...>]"
+"[B<--no-stop-on-upgrade>] [S<I<unit file> ...>]"
#. type: textblock
#: dh_systemd_start:20
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list