Author: djpig
Date: 2006-05-18 08:10:38 +0000 (Thu, 18 May 2006)
New Revision: 330

Modified:
   trunk/debian/changelog
   trunk/lib/showpkg.c
   trunk/man/C/dpkg-query.1
   trunk/man/ChangeLog
Log:
Fix printing of user defined fields with --showformat and
document the existance of this feature in dpkg-query man page.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2006-05-17 05:38:11 UTC (rev 329)
+++ trunk/debian/changelog      2006-05-18 08:10:38 UTC (rev 330)
@@ -34,6 +34,8 @@
     sh. Closes: #367329
   * Don't claim in dpkg man page that we set DPKG_OLD_CONFFILE and
     DPKG_NEW_CONFFILE on sub shells since we actually don't.
+  * Fix printing of user defined fields with --showformat and
+    document the existance of this feature in dpkg-query man page.
 
   [ Nicolas François ]
   * fix typos in the Russian man pages. Thanks to Stepan Golosunov.

Modified: trunk/lib/showpkg.c
===================================================================
--- trunk/lib/showpkg.c 2006-05-17 05:38:11 UTC (rev 329)
+++ trunk/lib/showpkg.c 2006-05-18 08:10:38 UTC (rev 330)
@@ -238,7 +238,7 @@
                                        break;
                                }
 
-                       if (!fip && pkg->installed.valid) {
+                       if (!fip->name && pkg->installed.valid) {
                                const struct arbitraryfield* afp;
 
                                for (afp=pkg->installed.arbs; afp; 
afp=afp->next)

Modified: trunk/man/C/dpkg-query.1
===================================================================
--- trunk/man/C/dpkg-query.1    2006-05-17 05:38:11 UTC (rev 329)
+++ trunk/man/C/dpkg-query.1    2006-05-18 08:10:38 UTC (rev 330)
@@ -153,6 +153,9 @@
 .fi
 
 The default format string is \(lq\fB${Package}\et${Version}\en\fP\(rq.
+Actually, all other fields found in the status file (i.e. user defined
+fields) can be requested, too. They will be printed as-is, though, no
+conversion nor error checking is done on them.
 To get the name of the dpkg maintainer and the installed version, you could
 run:
 

Modified: trunk/man/ChangeLog
===================================================================
--- trunk/man/ChangeLog 2006-05-17 05:38:11 UTC (rev 329)
+++ trunk/man/ChangeLog 2006-05-18 08:10:38 UTC (rev 330)
@@ -1,3 +1,8 @@
+2006-05-18  Frank Lichtenheld  <[EMAIL PROTECTED]>
+
+       * man/C/dpkg-query.1: Document that user defined
+       fields can also be printed with --showformat.
+
 2006-05-17  Frank Lichtenheld  <[EMAIL PROTECTED]>
 
        * man/C/dpkg.1: We don't actually set


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to