diff options
| author | Guillem Jover <guillem@debian.org> | 2019-11-16 00:41:57 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2019-11-26 02:42:45 +0100 |
| commit | 6e6bd74a5664b3d354dc7fd892a08eaf928980ad (patch) | |
| tree | fa3a6ef24adb5409a8198b57419ed3041cc41395 | |
| parent | a376ff0b20918ec4c66a6905529065d992095c35 (diff) | |
| download | dpkg-6e6bd74a5664b3d354dc7fd892a08eaf928980ad.tar.gz | |
Dpkg::Vendor: Remove obsolete 'keyrings' hook
This hook has been obsoleted for a while and been emitting deprecation
warnings, so it's safe to remove now.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | scripts/Dpkg/Vendor/Debian.pm | 3 | ||||
| -rw-r--r-- | scripts/Dpkg/Vendor/Default.pm | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index d481e4b1d..d28e3257a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium bool overload. - Dpkg::Checksums: Remove obsolete 'program' property warning. - Dpkg::Conf: Remove obsolete methods and obsolete croak for method option. + - Dpkg::Vendor: Remove obsolete 'keyrings' hook. * Documentation: - man: Fix uncommon wording constructs. - man: Use a minus sign for a literal string. diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index 71aa59038..a37b23cfc 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -51,9 +51,6 @@ sub run_hook { if ($hook eq 'package-keyrings') { return ('/usr/share/keyrings/debian-keyring.gpg', '/usr/share/keyrings/debian-maintainers.gpg'); - } elsif ($hook eq 'keyrings') { - warnings::warnif('deprecated', 'deprecated keyrings vendor hook'); - return $self->run_hook('package-keyrings', @params); } elsif ($hook eq 'archive-keyrings') { return ('/usr/share/keyrings/debian-archive-keyring.gpg'); } elsif ($hook eq 'archive-keyrings-historic') { diff --git a/scripts/Dpkg/Vendor/Default.pm b/scripts/Dpkg/Vendor/Default.pm index ed05c3009..6b7c5204f 100644 --- a/scripts/Dpkg/Vendor/Default.pm +++ b/scripts/Dpkg/Vendor/Default.pm @@ -157,9 +157,6 @@ sub run_hook { if ($hook eq 'before-source-build') { my $srcpkg = shift @params; - } elsif ($hook eq 'keyrings') { - warnings::warnif('deprecated', 'obsolete keyrings vendor hook'); - return (); } elsif ($hook eq 'package-keyrings') { return (); } elsif ($hook eq 'archive-keyrings') { |