This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=b4422f9db3533156560e0b4be592e854491b40e3

commit b4422f9db3533156560e0b4be592e854491b40e3
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Fri Nov 19 23:45:29 2021 +0100

    dpkg-query(1): Document full --search and --listfiles output format
    
    We need to mention the diversions output too and that it is localized,
    so that the output does not give surprises when being parsed.
    
    Prompted-by: Johannes Schauer Marin Rodrigues <jo...@debian.org>
---
 man/dpkg-query.pod | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/man/dpkg-query.pod b/man/dpkg-query.pod
index 3809ace09..ade71db25 100644
--- a/man/dpkg-query.pod
+++ b/man/dpkg-query.pod
@@ -143,6 +143,17 @@ List files installed to your system from I<package-name>. 
When multiple
 I<package-name>s are listed, the requested lists of files are separated
 by an empty line, with the same order as specified on the argument list.
 
+Each file diversion is printed on its own line after its diverted file,
+prefixed with one of the following localized strings:
+
+Z<>
+  locally diverted to: I<diverted-to>
+  package diverts others to: I<diverted-to>
+  diverted by I<pkg> to: I<diverted-to>
+
+Hint: When machine parsing the output, it is customary to set the locale to
+B<C.UTF-8> to get reproducible results.
+
 This command will not list extra files created by maintainer scripts,
 nor will it list alternatives.
 
@@ -198,6 +209,21 @@ followed by the pathname. As in:
   pkgname1, pkgname2: pathname1
   pkgname3: pathname2
 
+File diversions are printed with the following localized strings:
+
+Z<>
+  diversion by I<pkgname> from: I<diverted-from>
+  diversion by I<pkgname> to: I<diverted-to>
+
+or for local diversions:
+
+Z<>
+  local diversion from: I<diverted-from>
+  local diversion to: I<diverted-to>
+
+Hint: When machine parsing the output, it is customary to set the locale to
+B<C.UTF-8> to get reproducible results.
+
 =item B<-p>, B<--print-avail> [I<package-name>...]
 
 Display details about packages, as found in I<%ADMINDIR%/available>.

-- 
Dpkg.Org's dpkg

Reply via email to