Package: dput Version: 0.9.2.20 Severity: wishlist Tags: patch Hi.
Like in #324183, I have 2 keys matching my Debian account. But instead of using DEBSIGN_KEYID, I'd like to use debsign's -k option. Patch is attached. Christoph -- [EMAIL PROTECTED] | http://www.df7cb.de/
diff -Nru /home/cb/tmp/yMFsgH8qZG/dput-0.9.2.20/dcut
/home/cb/tmp/XceNjnhPzi/dput-0.9.2.20/dcut
--- /home/cb/tmp/yMFsgH8qZG/dput-0.9.2.20/dcut 2005-09-06 18:44:34.000000000
+0200
+++ /home/cb/tmp/XceNjnhPzi/dput-0.9.2.20/dcut 2005-09-23 16:39:08.000000000
+0200
@@ -32,6 +32,7 @@
-v Display version information.
-m maintaineraddress
Use maintainer information in "Uploader:" field.
+ -k keyid Use this keyid for signing.
-O file Write commands to file.
-U file Upload specified commands file (presently no checks).
Supported commands: mv, rm
@@ -42,7 +43,7 @@
def getoptions():
# seed some defaults
options = {'debug':0, 'simulate':0, 'config':None, 'host':None,
- 'uploader':None, 'passive':0, 'filetocreate':None,
+ 'uploader':None, 'keyid':None, 'passive':0, 'filetocreate':None,
'filetoupload':None}
# enable debugging very early
if ('-d' in sys.argv[1:] or '--debug' in sys.argv[1:]):
@@ -80,12 +81,12 @@
# parse command line arguments
try:
(opts, arguments) = getopt.getopt(sys.argv[1:],
- 'c:dDhsvm:PU:O:',
+ 'c:dDhsvm:k:PU:O:',
['config=', 'debug',
'help', 'simulate', 'version','host=',
- 'maintainteraddress=','passive','upload=',
- 'output='
- ])
+ 'maintainteraddress=', 'keyid=',
+ 'passive', 'upload=', 'output='
+ ])
except getopt.error, msg:
print msg
sys.exit(1)
@@ -104,6 +105,8 @@
options['config'] = arg
elif option in ('-m', '--maintaineraddress'):
options['uploader'] = arg
+ elif option in ('-k', '--keyid'):
+ options['keyid'] = arg
elif option in ('-s', '--simulate'):
options['simulate'] = 1
elif option in ('-P', '--passive'):
@@ -179,6 +182,7 @@
f.write("Commands:\n %s\n\n"%('\n '.join(commands)))
f.close()
debsign_cmdline = "debsign '-m%s'" % options['uploader']
+ if options['keyid']: debsign_cmdline += " '-k%s'" % options['keyid']
debsign_cmdline += " '%s'" % filename
if options['debug']: print "D: calling debsign:",debsign_cmdline
if os.system(debsign_cmdline):
diff -Nru /home/cb/tmp/yMFsgH8qZG/dput-0.9.2.20/dcut.1
/home/cb/tmp/XceNjnhPzi/dput-0.9.2.20/dcut.1
--- /home/cb/tmp/yMFsgH8qZG/dput-0.9.2.20/dcut.1 2004-12-21
09:27:24.000000000 +0100
+++ /home/cb/tmp/XceNjnhPzi/dput-0.9.2.20/dcut.1 2005-09-23
17:02:44.000000000 +0200
@@ -52,6 +52,10 @@
Use \fImaintainer\fR for the uploader field and gpg key selection.
This has no effect when \fB--upload\fR is used.
.TP
+.B \-k \fIkeyid\fR, \fB\-\-keyid\fR=\fIkeyid\fR
+Use \fIkeyid\fR for signing. Default is to let \fBdebsign\fR choose a keyid.
+This has no effect when \fB--upload\fR is used.
+.TP
.B \-O \fIfilename\fR, \fB\-\-output\fR=\fIfilename\fR
Write commands file to \fIfilename\fR instead of uploading.
You sould not specify a host when using this option.
diff -Nru /home/cb/tmp/yMFsgH8qZG/dput-0.9.2.20/debian/changelog
/home/cb/tmp/XceNjnhPzi/dput-0.9.2.20/debian/changelog
--- /home/cb/tmp/yMFsgH8qZG/dput-0.9.2.20/debian/changelog 2005-09-06
19:25:24.000000000 +0200
+++ /home/cb/tmp/XceNjnhPzi/dput-0.9.2.20/debian/changelog 2005-09-23
17:03:43.000000000 +0200
@@ -1,3 +1,9 @@
+dput (0.9.2.20-0.1) unstable; urgency=low
+
+ * Add -kkeyid option.
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Fri, 23 Sep 2005 17:03:16 +0200
+
dput (0.9.2.20) unstable; urgency=low
* Add | debconf-2.0 to debconf-dependency.
signature.asc
Description: Digital signature
