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

guillem pushed a commit to branch master
in repository dpkg.

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

commit 3828a82cb4c4d42a6b18d6d59f30a09dcbc65aa4
Author: Guillem Jover <[email protected]>
AuthorDate: Sat Feb 23 04:56:30 2019 +0100

    libdpkg: Print a more accurate warning for Revision nicknames
    
    Now that we do not use a nickname mapping anymore, the field struct
    contains the actual field name matched, so we can report it correctly
    instead of listing all possible altrnatives, and then missing some.
---
 debian/changelog  | 1 +
 lib/dpkg/fields.c | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a33d3c7b2..9437a33f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
     error, which has a significant performance cost.
   * libdpkg: Merge nicknames table into fieldinfos, to stop penalizing the
     lookup of non-obsolete fieldnames.
+  * libdpkg: Print a more accurate warning for Revision nicknames.
   * Perl modules:
     - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted
       tag. Suggested by Alexander E. Patrakov <[email protected]>.
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index a2e5ef81c..8294149b9 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -286,9 +286,7 @@ f_revision(struct pkginfo *pkg, struct pkgbin *pkgbin,
 {
   char *newversion;
 
-  parse_warn(ps,
-             _("obsolete '%s' or '%s' field used"),
-             "Revision", "Package-Revision");
+  parse_warn(ps, _("obsolete '%s' field used"), fip->name);
   if (!*value) return;
   if (str_is_set(pkgbin->version.revision)) {
     newversion = nfmalloc(strlen(pkgbin->version.version) +

-- 
Dpkg.Org's dpkg

Reply via email to