summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-09 08:02:18 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-09 08:02:18 +0100
commitc8a91e6973d6fc51c83eb200dfeee6aa762373de (patch)
tree856db5a838556ef1c8660c3929341b5b4eae9ddc /dgit
parent78da6ef66fe3fe946de3ee06d398188cb736322a (diff)
document --gpg=
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit4
1 files changed, 4 insertions, 0 deletions
diff --git a/dgit b/dgit
index 6c1477c..3c24c2c 100755
--- a/dgit
+++ b/dgit
@@ -76,6 +76,8 @@ our %opts_opt_map = ('dget' => \@dget,
'ch' => \@changesopts,
'mergechanges' => \@mergechanges);
+our %opts_opt_cmdonly = ('gpg' => 1);
+
our $keyid;
our $debug = 0;
@@ -1134,6 +1136,7 @@ sub sign_changes ($) {
if ($sign) {
my @debsign_cmd = @debsign;
push @debsign_cmd, "-k$keyid" if defined $keyid;
+ push @debsign_cmd, "-p$pgp[0]" if $pgp[0] ne 'gpg';
push @debsign_cmd, $changesfile;
runcmd_ordryrun @debsign_cmd;
}
@@ -1690,6 +1693,7 @@ sub parseopts () {
push @ropts, $_;
$om->[0] = $2;
} elsif (m/^--(\w+):(.*)/s &&
+ !$opts_opt_cmdonly{$1} &&
($om = $opts_opt_map{$1})) {
push @ropts, $_;
push @$om, $2;