diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/dpkg-buildpackage.pl | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 327e980c9..ec12434ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium SELinux. See #811037. * dpkg: Clarify error on unknown system user/group in statoverride database. Closes: #920880 + * dpkg-buildpackage: Clarify the warning/error on short OpenPGP key IDs. + Closes: #922039 * Documentation: - start-stop-daemon(1): Document behavior of --pidfile security checks. Closes: #921557 diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index c50416580..b19f72278 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -829,10 +829,12 @@ sub signkey_validate { if (length $keyid <= 8) { error(g_('short OpenPGP key IDs are broken; ' . - 'please use key fingerprints instead')); + 'please use key fingerprints in %s or %s instead'), + '-k', 'DEB_SIGN_KEYID'); } elsif (length $keyid <= 16) { warning(g_('long OpenPGP key IDs are strongly discouraged; ' . - 'please use key fingerprints instead')); + 'please use key fingerprints in %s or %s instead'), + '-k', 'DEB_SIGN_KEYID'); } } |