summaryrefslogtreecommitdiff
path: root/man/dpkg-divert.man
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2018-04-09 02:04:15 +0200
committerGuillem Jover <guillem@debian.org>2018-05-03 02:17:17 +0200
commit599e3c1a9f3be8687c00b681f107e7b98bb454ae (patch)
tree76d3505256f63bbce2e7bf08e0732c83891bc5fb /man/dpkg-divert.man
parentca90fbfa7c020bc92cdec9f3b2cad9076626f7a0 (diff)
downloaddpkg-599e3c1a9f3be8687c00b681f107e7b98bb454ae.tar.gz
dpkg-divert: Warn when using --add or --remove w/o --rename or --no-rename
Using --no-rename as the default optimizes for the wrong case, as that's the exception, and while the safest option, it is needed only by packages that are part of the pseudo-Essential set. It's also cumbersome for the --local case. We will emit a warning asking those to be explicit, so that we can switch the default to --rename during the 1.20.x cycle. Prompted-by: Paul Wise <pabs@debian.org>
Diffstat (limited to 'man/dpkg-divert.man')
-rw-r--r--man/dpkg-divert.man4
1 files changed, 3 insertions, 1 deletions
diff --git a/man/dpkg-divert.man b/man/dpkg-divert.man
index 48fcc0c93..8631c20f5 100644
--- a/man/dpkg-divert.man
+++ b/man/dpkg-divert.man
@@ -46,9 +46,11 @@ contains those files.
.TP
.RB [ \-\-add "] \fIfile\fP"
Add a diversion for \fIfile\fP.
+The file is currently not renamed, see \fB\-\-rename\fP.
.TP
.BI \-\-remove " file"
Remove a diversion for \fIfile\fP.
+The file is currently not renamed, see \fB\-\-rename\fP.
.TP
.BI \-\-list " glob-pattern"
List diversions matching \fIglob-pattern\fP.
@@ -97,7 +99,7 @@ diversion into the database (since dpkg 1.19.1).
This is intended for diversions of files from the \fBEssential\fP package set,
where the temporary disappearance of the original file is not acceptable, as
it can render the system non-functional.
-This is the default behavior.
+This is the default behavior, but that will change in the dpkg 1.20.x cycle.
.TP
.B \-\-test
Test mode, i.e. don't actually perform any changes, just demonstrate.