summaryrefslogtreecommitdiff
path: root/man/dpkg-divert.man
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2018-04-02 16:33:11 +0200
committerGuillem Jover <guillem@debian.org>2018-05-03 02:14:14 +0200
commitca90fbfa7c020bc92cdec9f3b2cad9076626f7a0 (patch)
tree2cf702d9c9a6e253d2aa9eb162f8dcca6864451c /man/dpkg-divert.man
parent64fca5b2fc9b12d5971453d62bef439132b78d42 (diff)
downloaddpkg-ca90fbfa7c020bc92cdec9f3b2cad9076626f7a0.tar.gz
dpkg-divert: Add new --no-rename option
Document its intended usage and how it differs from --rename. This will make it possible to do a behavior switch during the 1.20.x release cycle.
Diffstat (limited to 'man/dpkg-divert.man')
-rw-r--r--man/dpkg-divert.man12
1 files changed, 11 insertions, 1 deletions
diff --git a/man/dpkg-divert.man b/man/dpkg-divert.man
index c9d7e1ce7..48fcc0c93 100644
--- a/man/dpkg-divert.man
+++ b/man/dpkg-divert.man
@@ -3,7 +3,7 @@
.\" Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
.\" Copyright © 1999 Wichert Akkerman <wakkerma@debian.org>
.\" Copyright © 2004 Scott James Remnant <keybuk@debian.org>
-.\" Copyright © 2007-2013, 2015 Guillem Jover <guillem@debian.org>
+.\" Copyright © 2007-2013, 2015-2018 Guillem Jover <guillem@debian.org>
.\"
.\" This is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
@@ -88,6 +88,16 @@ Quiet mode, i.e. no verbose output.
.B \-\-rename
Actually move the file aside (or back). \fBdpkg\-divert\fP will abort operation
in case the destination file already exists.
+This is the common behavior used for diversions of files from the
+non-\fBEssential\fP package set (see \fB\-\-no\-rename\fP for more details).
+.TP
+.B \-\-no\-rename
+Specifies that the file should not be renamed while adding or removing the
+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.
.TP
.B \-\-test
Test mode, i.e. don't actually perform any changes, just demonstrate.