[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.0-22-ge53e415

[Luca Bruno]

The following commit has been merged in the master branch:
commit 227f63e9cf0c81700dc5ee7f20fcde08edfa48cc
Author: Luca Bruno <lethalman88 at gmail.com>
Date:   Wed Mar 25 21:23:00 2009 +0100

    Default name and email. Closes: #521162/5

diff --git a/bin/reportbug b/bin/reportbug
index 434d76c..e902d74 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -463,7 +463,7 @@ def offer_configuration(options):
         realname = ''
 
     realname = ui.get_string('What real name should be used for sending bug '
-                             'reports? [%s]' % realname, force_prompt=True)
+                             'reports?', default=realname, force_prompt=True)
     if isinstance(realname, str):
         realname = realname.decode(charset, 'replace')
 
@@ -471,8 +471,8 @@ def offer_configuration(options):
         'Which of your email addresses should be used when sending bug '
         'reports? (Note that this address will be visible in the bug tracking '
         'system, so you may want to use a webmail address or another address '
-        'with good spam filtering capabilities.) [%s]' %
-        (options.email or def_email), force_prompt=True)
+        'with good spam filtering capabilities.)',
+        default=(options.email or def_email), force_prompt=True)
 
     stupidmode = not ui.yes_no(
         'Do you have a "mail transport agent" (MTA) like Exim, Postfix or '
diff --git a/debian/changelog b/debian/changelog
index cf3f85e..02da43d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
 reportbug (4.1) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * reportbug/__init__.py
     - bump version
   * debian/{desktop, dirs, rules}
     - install desktop file; thanks to Fabian Greffrath for the report and file;
       Closes: #521186
 
- -- Sandro Tosi <morph at debian.org>  Wed, 25 Mar 2009 20:31:24 +0100
+  [ Luca Bruno ]
+  * bin/reportbug:
+    - fix default when choosing for realname and email at configuration time
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Wed, 25 Mar 2009 21:20:47 +0100
 
 reportbug (4.0) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution