diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-22 15:18:27 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-22 15:18:27 +0100 |
commit | 377e1c315cc73e5364506cf5eb601de130f72c77 (patch) | |
tree | f459c603b002358bab69b8d5b83d079160e6252e | |
parent | 99c4248904bd8d22b9745777e247d4cf9ffcf536 (diff) |
Support dgit-distro.<distro>.keyid config option.
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | dgit | 3 | ||||
-rw-r--r-- | dgit.1 | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e14257f..f0a3cb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dgit (0.4~pre2) experimental; urgency=low * Mangle debian/<version> tags the way git-buildpackage does (as of git-buildpackage 0.5.5, 3c6bbd0f4992f8da). + * Support dgit-distro.<distro>.keyid config option. -- @@ -815,6 +815,9 @@ sub dopush () { print "[new .dsc left in $dscfn.tmp]\n"; } if ($sign) { + if (!defined $keyid) { + $keyid = access_cfg('keyid','RETURN-UNDEF'); + } my @tag_cmd = (@git, qw(tag -s -m), "Release $dversion for $csuite [dgit]"); push @tag_cmd, qw(-u),$keyid if defined $keyid; @@ -411,6 +411,8 @@ on the dgit command line. .TP .BI dgit-distro. distro .ssh .TP +.BI dgit-distro. distro .keyid +.TP .BR dgit.default. * for each .BR dgit-distro. \fIdistro\fR . * |