[dpkg] 25/38: Dpkg::OpenPGP: Rename and namespace GnuPG specific symbols

[Guillem Jover]

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

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=280f64d6c07b41b0e24313b4ff750cd13f95115a

commit 280f64d6c07b41b0e24313b4ff750cd13f95115a
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Tue Jul 19 13:55:32 2022 +0200

    Dpkg::OpenPGP: Rename and namespace GnuPG specific symbols
    
    These functions are really GnuPG specific, so give them matching names.
---
 scripts/Dpkg/OpenPGP.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index 41b816db2..e51e5ac91 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -33,7 +33,7 @@ our @EXPORT = qw(
     openpgp_sig_to_asc
 );
 
-sub _armor_gpg {
+sub _gpg_armor {
     my ($sig, $asc) = @_;
 
     my @gpg_opts = qw(--no-options);
@@ -80,7 +80,7 @@ sub openpgp_sig_to_asc
         }
 
         if (find_command('gpg')) {
-            return _armor_gpg($sig, $asc);
+            return _gpg_armor($sig, $asc);
         } else {
             warning(g_('cannot OpenPGP ASCII armor signature file due to 
missing gpg'));
         }
@@ -89,7 +89,7 @@ sub openpgp_sig_to_asc
     return;
 }
 
-sub _exec_openpgp
+sub _gpg_exec
 {
     my ($opts, $exec, $errmsg) = @_;
 
@@ -129,17 +129,17 @@ sub _gpg_options_common {
 sub _gpg_import_keys {
     my ($opts, $keyring, @keys) = @_;
 
-    my $gpghome = File::Temp->newdir('dpkg-gpg-import-keys.XXXXXXXX', TMPDIR 
=> 1);
+    my $gpg_home = File::Temp->newdir('dpkg-gpg-import-keys.XXXXXXXX', TMPDIR 
=> 1);
 
     my @exec = qw(gpg);
     push @exec, _gpg_options_common();
-    push @exec, '--homedir', $gpghome;
+    push @exec, '--homedir', $gpg_home;
     push @exec, '--keyring', $keyring;
     push @exec, '--import';
 
     foreach my $key (@keys) {
         my $errmsg = sprintf g_('cannot import key %s into %s'), $key, 
$keyring;
-        _exec_openpgp($opts, [ @exec, $key ], $errmsg);
+        _gpg_exec($opts, [ @exec, $key ], $errmsg);
     }
 }
 
@@ -164,11 +164,11 @@ sub import_key {
 sub _gpg_verify {
     my ($opts, $data, $sig, @certs) = @_;
 
-    my $gpghome = File::Temp->newdir('dpkg-gpg-verify.XXXXXXXX', TMPDIR => 1);
+    my $gpg_home = File::Temp->newdir('dpkg-gpg-verify.XXXXXXXX', TMPDIR => 1);
 
     my @exec = qw(gpgv);
     push @exec, _gpg_options_weak_digests();
-    push @exec, '--homedir', $gpghome;
+    push @exec, '--homedir', $gpg_home;
     foreach my $cert (@certs) {
         push @exec, '--keyring', $cert;
     }
@@ -176,7 +176,7 @@ sub _gpg_verify {
     push @exec, $data;
 
     my $errmsg = sprintf g_('cannot verify signature for %s'), $data;
-    _exec_openpgp($opts, \@exec, $errmsg);
+    _gpg_exec($opts, \@exec, $errmsg);
 }
 
 sub inline_verify {

-- 
Dpkg.Org's dpkg