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=fd1b41d81578a97399284f72ae703c0a32e3f905 commit fd1b41d81578a97399284f72ae703c0a32e3f905 Author: Guillem Jover <[email protected]> AuthorDate: Fri Aug 24 21:18:12 2018 +0200 Dpkg::OpenPGP: Return the destination path on successful ASCII armor conversion This way we can distinguish the failure from the success case. --- debian/changelog | 2 ++ scripts/Dpkg/OpenPGP.pm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc0c41ba6..9f5e81dfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -156,6 +156,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium directory which is a descendent of the current working directory. - Dpkg::Source::Package::V3::Quilt: Print series file used when applying patches. + - Dpkg::OpenPGP: Return the destination path on successful ASCII armor + conversion. * Documentation: - Update gettext minimal version in README. - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph. diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm index 858d3efcf..8d85e845d 100644 --- a/scripts/Dpkg/OpenPGP.pm +++ b/scripts/Dpkg/OpenPGP.pm @@ -49,7 +49,7 @@ sub openpgp_sig_to_asc if ($is_openpgp_ascii_armor) { notice(g_('signature file is already OpenPGP ASCII armor, copying')); copy($sig, $asc); - return; + return $asc; } if (not find_command('gpg')) { @@ -71,7 +71,7 @@ sub openpgp_sig_to_asc close $fh_gpg or subprocerr('gpg'); close $fh_asc or syserr(g_('cannot write signature file %s'), $asc); - return $sig; + return $asc; } return; -- Dpkg.Org's dpkg
