summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--man/dpkg.133
2 files changed, 21 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index bcd897fb0..107626a3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
- Add man page references to other binary control files in dpkg(1).
- Add version when "new" substvars were introduced in deb-substvars(5).
- Switch deb-triggers(5) types into a proper list.
+ - Itemize --log format entries in dpkg(1).
* Build system:
- Add support for profiling perl modules.
- Clean up compiler and linker automatic flag usage in configure.
diff --git a/man/dpkg.1 b/man/dpkg.1
index 6cbabb75b..56923cccc 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -785,19 +785,26 @@ The output format used is the same as in \fB\-\-status\-fd\fP.
\fB\-\-log=\fP\fIfilename\fP
Log status change updates and actions to \fIfilename\fP, instead of
the default \fI/var/log/dpkg.log\fP. If this option is given multiple
-times, the last filename is used. Log messages are of the form
-\(oqYYYY-MM-DD HH:MM:SS startup \fItype\fP \fIcommand\fP\(cq for each dpkg
-invocation where \fItype\fP is \fBarchives\fP (with a \fIcommand\fP of
-\fBunpack\fP or \fBinstall\fP) or \fBpackages\fP (with a \fIcommand\fP of
-\fBconfigure\fP, \fBtriggers\-only\fP, \fBremove\fP or \fBpurge\fP);
-\(oqYYYY-MM-DD HH:MM:SS status \fIstate\fP \fIpkg\fP \fIinstalled-version\fP\(cq
-for status change updates;
-\(oqYYYY-MM-DD HH:MM:SS \fIaction\fP \fIpkg\fP \fIinstalled-version\fP
-\fIavailable-version\fP\(cq for actions where \fIaction\fP is one of
-\fBinstall\fP, \fBupgrade\fP, \fBconfigure\fP, \fBtrigproc\fP,
-\fBdisappear\fP, \fBremove\fP or \fBpurge\fP; and
-\(oqYYYY-MM-DD HH:MM:SS conffile \fIfilename\fP \fIdecision\fP\(cq for conffile
-changes where \fIdecision\fP is either \fBinstall\fP or \fBkeep\fP.
+times, the last filename is used. Log messages are of the form:
+.RS
+.TP
+YYYY-MM-DD HH:MM:SS \fBstartup\fP \fItype\fP \fIcommand\fP
+For each dpkg invocation where \fItype\fP is \fBarchives\fP (with a
+\fIcommand\fP of \fBunpack\fP or \fBinstall\fP) or \fBpackages\fP
+(with a \fIcommand\fP of \fBconfigure\fP, \fBtriggers\-only\fP,
+\fBremove\fP or \fBpurge\fP).
+.TP
+YYYY-MM-DD HH:MM:SS \fBstatus\fP \fIstate\fP \fIpkg\fP \fIinstalled-version\fP
+For status change updates.
+.TP
+YYYY-MM-DD HH:MM:SS \fIaction\fP \fIpkg\fP \fIinstalled-version\fP \fIavailable-version\fP
+For actions where \fIaction\fP is one of \fBinstall\fP, \fBupgrade\fP,
+\fBconfigure\fP, \fBtrigproc\fP, \fBdisappear\fP, \fBremove\fP or \fBpurge\fP.
+.TP
+YYYY-MM-DD HH:MM:SS \fBconffile\fP \fIfilename\fP \fIdecision\fP
+For conffile changes where \fIdecision\fP is either \fBinstall\fP or
+\fBkeep\fP.
+.RE
.TP
\fB\-\-no\-debsig\fP
Do not try to verify package signatures.