From cb225bd8f2ac21d39821d4d4bee20b89b49d4ab2 Mon Sep 17 00:00:00 2001
From: Evan Broder <evan@ebroder.net>
Date: Sat, 11 Feb 2012 11:59:46 -0800
Subject: [PATCH] sponsor-patch, requestsync, syncpackage: Add a config
 variable for -k arguments

---
 doc/requestsync.1   | 3 +++
 doc/sponsor-patch.1 | 3 +++
 doc/syncpackage.1   | 3 +++
 requestsync         | 3 +++
 sponsor-patch       | 2 ++
 syncpackage         | 3 +++
 6 files changed, 17 insertions(+)

diff --git a/doc/requestsync.1 b/doc/requestsync.1
index 1ca9043..3075057 100644
--- a/doc/requestsync.1
+++ b/doc/requestsync.1
@@ -125,6 +125,9 @@ Setting this to \fIno\fR is equivalent to running with \fB--email\fR.
 .TP
 .BR REQUESTSYNC_LPINSTANCE ", " UBUNTUTOOLS_LPINSTANCE
 The default value for \fB--lpinstance\fR.
+.TP
+.BR REQUESTSYNC_KEYID ", " UBUNTUTOOLS_KEYID
+The default value for \fB-k\fR.
 
 .SH SEE ALSO
 .BR rmadison (1),
diff --git a/doc/sponsor-patch.1 b/doc/sponsor-patch.1
index b462a7c..fe7e3ac 100644
--- a/doc/sponsor-patch.1
+++ b/doc/sponsor-patch.1
@@ -126,6 +126,9 @@ The default value for \fB--update\fR.
 .TP
 .BR SPONSOR_PATCH_WORKDIR ", " UBUNTUTOOLS_WORKDIR
 The default value for \fB--workdir\fR.
+.TP
+.BR SPONSOR_PATCH_KEYID ", " UBUNTUTOOLS_KEYID
+The default value for \fB--key\fR.
 
 .SH EXAMPLES
 Test-building and sponsoring an upload of bug \fB1234\fR:
diff --git a/doc/syncpackage.1 b/doc/syncpackage.1
index 3a3e8e2..8fc11a9 100644
--- a/doc/syncpackage.1
+++ b/doc/syncpackage.1
@@ -139,6 +139,9 @@ The default value for \fB\-\-debian\-mirror\fR.
 .TP
 .BR SYNCPACKAGE_UBUNTU_MIRROR ", " UBUNTUTOOLS_DEBSEC_MIRROR
 The default value for \fB\-\-ubuntu\-mirror\fR.
+.TP
+.BR SYNCPACKAGE_KEYID ", " UBUNTUTOOLS_KEYID
+The default value for \fB\-\-key\fR.
 .\"
 .SH SEE ALSO
 .BR requestsync (1),
diff --git a/requestsync b/requestsync
index 5e6645f..88bd19d 100755
--- a/requestsync
+++ b/requestsync
@@ -110,6 +110,9 @@ def main():
     if options.lpinstance is None:
         options.lpinstance = config.get_value('LPINSTANCE')
 
+    if options.keyid is None:
+        options.keyid = config.get_value('KEYID')
+
     if not options.lpapi:
         if options.lpinstance == 'production':
             bug_mail_domain = 'bugs.launchpad.net'
diff --git a/sponsor-patch b/sponsor-patch
index 4b2a96e..8c7680b 100755
--- a/sponsor-patch
+++ b/sponsor-patch
@@ -89,6 +89,8 @@ def parse(script_name):
         options.update = config.get_value("UPDATE_BUILDER", boolean=True)
     if options.workdir is None:
         options.workdir = config.get_value("WORKDIR")
+    if options.keyid is None:
+        options.keyid = config.get_value("KEYID")
 
     if options.sponsoring:
         options.build = True
diff --git a/syncpackage b/syncpackage
index 54b2d14..70a608f 100755
--- a/syncpackage
+++ b/syncpackage
@@ -628,6 +628,9 @@ def main():
     if options.ubuntu_mirror is None:
         options.ubuntu_mirror = config.get_value('UBUNTU_MIRROR')
 
+    if options.keyid is None:
+        options.keyid = config.get_value('KEYID')
+
     if options.lpinstance is None:
         options.lpinstance = config.get_value('LPINSTANCE')
     try: