[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-73-gac95765

[Sandro Tosi]

The following commit has been merged in the master branch:
commit ac95765a9ef63435765ca4c533a42d1137725f9a
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Mar 12 23:52:34 2010 +0100

    exit if -K/--keyid is specified without a sign method specified (either --pgp or --gpg); thanks to Jonathan Wiltshire for the report; Closes: #573558

diff --git a/bin/reportbug b/bin/reportbug
index 76a2332..c28ddb1 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -955,6 +955,10 @@ def main():
             print "The above files are missing, so can't be attached; exiting"
             sys.exit(1)
 
+    if options.keyid and not options.sign:
+        ewrite('Option -K/--keyid requires --gpg or --pgp sign option set, which currently is not; exiting.\n')
+        sys.exit(1)
+
     if options.draftpath:
         options.draftpath = os.path.expanduser(options.draftpath)
         if not os.path.exists(options.draftpath):
diff --git a/debian/changelog b/debian/changelog
index e3f1d5e..1ea353d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ reportbug (4.10.3) UNRELEASED; urgency=low
       der Spek for the report and to Carl Chenet for the patch; Closes: #567501
     - remove release critical severities when running in 'novice' mode; thanks
       to Steve Langasek for the report; Closes: #295386
+    - exit if -K/--keyid is specified without a sign method specified (either
+      --pgp or --gpg); thanks to Jonathan Wiltshire for the report;
+      Closes: #573558
   * bin/reportbug, reportbug/{debianbts.py, ui/urwid_ui.py}
     - reorganized how BTS tags are retrieved and used
     - create a get_tags() method to return the tags depending on severity of bug
@@ -55,7 +58,7 @@ reportbug (4.10.3) UNRELEASED; urgency=low
       save the report and exit; thanks to Stuart Young for the report;
       Closes: #293266
 
- -- Sandro Tosi <morph at debian.org>  Fri, 12 Mar 2010 20:08:57 +0100
+ -- Sandro Tosi <morph at debian.org>  Fri, 12 Mar 2010 23:52:24 +0100
 
 reportbug (4.10.2) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution