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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 9945075e552615e6afc24c948173b35874fe1b72
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Dec 26 18:41:15 2010 +0100

    warn that bug reports are publicly archive (email address included); thanks to Holger Levsen for the report; Closes: #605892

diff --git a/bin/reportbug b/bin/reportbug
index f827334..d4eeec4 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1235,6 +1235,9 @@ class UI(object):
         tfprefix = tempfile_prefix(package)
         if self.options.interface == 'text':
             ewrite('*** Welcome to reportbug.  Use ? for help at prompts. ***\n')
+        # we show this for the 2 "textual" UIs
+        if self.options.interface in ('text', 'urwid'):
+            ewrite('Note: bug reports are publicly archived (including the email address of the submitter).\n')
 
         try:
             blah = u'hello'.encode(charset)
diff --git a/debian/changelog b/debian/changelog
index 7adedcc..9619960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,11 @@ reportbug (4.99.0) UNRELEASED; urgency=low
   * reportbug/utils.py
     - commands.getoutput() strips tailing new line, so adding one to
       lsb_release_info; thanks to Yaroslav Halchenko for (partial) patch
+  * bin/reportbug, reportbug/ui/gtk2_ui.py
+    - warn that bug reports are publicly archive (email address included);
+      thanks to Holger Levsen for the report; Closes: #605892
 
- -- Sandro Tosi <morph at debian.org>  Sun, 26 Dec 2010 15:56:52 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 26 Dec 2010 18:39:43 +0100
 
 reportbug (4.12.6) unstable; urgency=low
 
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index 056ef0a..b0afd82 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -601,7 +601,9 @@ class IntroPage (Page):
         label = gtk.Label ("""
 <b>Reportbug</b> is a tool designed to make the reporting of bugs in Debian and derived distributions relatively painless.
 
-This wizard will guide you through the bug reporting process step by step.""")
+This wizard will guide you through the bug reporting process step by step.
+
+<b>Note:</b> bug reports are publicly archived (including the email address of the submitter).""")
         label.set_use_markup (True)
         label.set_line_wrap (True)
         label.set_justify (gtk.JUSTIFY_FILL)

-- 
Reportbug - reports bugs in the Debian distribution