diff options
author | Guillem Jover <guillem@debian.org> | 2014-04-28 13:02:15 +0200 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2014-04-28 13:08:24 +0200 |
commit | 15c4eb9f7223dcc309b46ba89b2b3081e2f9a2a7 (patch) | |
tree | 554732a49879ddc5e68374d976a3765613283700 | |
parent | deeb5efc57607b02703d145a1a74bba502cbc0e6 (diff) | |
download | dpkg-15c4eb9f7223dcc309b46ba89b2b3081e2f9a2a7.tar.gz |
dpkg(1): Improve wording for --verify and --verify-format
Closes: #733057
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | man/dpkg.1 | 22 |
2 files changed, 15 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index c6ebf66e4..ed3ceac5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ dpkg (1.17.8) UNRELEASED; urgency=low * Handle space-only strings when parsing versions in libdpkg. * Document the environment requirements for the dpkg-maintscript-helper supports command in the man page. Closes: #739634 + * Improve wording for «dpkg --verify» and --verify-format in the man page. + Closes: #733057 [ Updated programs translations ] * German (Sven Joachim). diff --git a/man/dpkg.1 b/man/dpkg.1 index 12b5a63b5..52a79a1c0 100644 --- a/man/dpkg.1 +++ b/man/dpkg.1 @@ -6,7 +6,7 @@ .\" Copyright © 2000-2003 Adam Heath <doogie@debian.org> .\" Copyright © 2002 Josip Rodin .\" Copyright © 2004-2005 Scott James Remnant <keybuk@debian.org> -.\" Copyright © 2006-2013 Guillem Jover <guillem@debian.org> +.\" Copyright © 2006-2014 Guillem Jover <guillem@debian.org> .\" Copyright © 2007-2008 Ian Jackson <ian@davenant.greenend.org.uk> .\" Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org> .\" @@ -23,7 +23,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see <https://www.gnu.org/licenses/>. . -.TH dpkg 1 "2013-07-28" "Debian Project" "dpkg suite" +.TH dpkg 1 "2014-04-28" "Debian Project" "dpkg suite" .SH NAME dpkg \- package manager for Debian . @@ -206,12 +206,15 @@ Removing of a package consists of the following steps: .TP .BR \-V ", " \-\-verify " [\fIpackage-name\fP...] Verifies the integrity of \fIpackage-name\fP or all packages if omitted, -by comparing information from the installed paths with the database -metadata. +by comparing information from the package installed paths with information +from the files taken from the package metadata stored in the \fBdpkg\fP +database. The origin of the information in the database is the binary +packages themselves, which gets collected at package unpack time during +installation. The output format is selectable with the \fB\-\-verify\-format\fP option, which by default uses the \fBrpm\fP format, but that might -change in the future, and as such programs parsing this command +change in the future, and as such, programs parsing this command output should be explicit about the format they expect. .TP \fB\-\-update\-avail\fP, \fB\-\-merge\-avail\fP [\fIPackages-file\fP] @@ -632,12 +635,13 @@ Sets the output format for the \fB\-\-verify\fP command. The only currently supported output format is \fBrpm\fP, which consists of a line for every path that failed any check. The lines start with 9 -characters to report the specific check results, a '\fB?\fP' implies the +characters to report each specific check result, a '\fB?\fP' implies the check could not be done (lack of support, file permissions, etc), '\fB.\fP' implies the check passed, and an alphanumeric character implies a specific -check failed; the only functional check is an md5sum verification denoted -with a '\fB5\fP' on the third character. The line is followed by a space -and an attribute character (currently '\fBc\fP' for conffiles), another +check failed; currently the only functional check is an md5sum verification +against the stored value in the files database, denoted with a '\fB5\fP' on +the third character. The line is followed by a space and an attribute +character (currently '\fBc\fP' for conffiles), another space and the pathname. .TP \fB\-\-status\-fd \fR\fIn\fR |