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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 8af70aabab09abf341179e61eb46750b90265416
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Apr 5 15:07:59 2010 +0200

    append a notice to every 'presubj' script shown in UI text that 'q' is probably the key to press to exit the pager (updating reportbug 'presubj' script to remove that notice); thanks to Chris Walker for the report; Closes: #488414

diff --git a/bin/reportbug b/bin/reportbug
index 5f4c07e..98e0a41 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1737,7 +1737,7 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
         ewrite('\n')
         prompted = False
         if interactive and not (self.options.kudos or exinfo) and presubj:
-            ui.display_report(open(presubj).read()+'\n')
+            ui.display_report(open(presubj).read()+'\n', presubj=True)
 
         if self.options.kudos:
             subject = subject or ('Thanks for packaging %s!' % package)
diff --git a/debian/changelog b/debian/changelog
index 21b5380..1c6f429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,13 @@ reportbug (4.12) UNRELEASED; urgency=low
     - added the '--from-buildd $SRC_$VER' option to make reportbug file the bug
       against the source package $SRC for the given $VER version; thanks to
       Cyril Brulebois for the report; Closes: #571970
+  * bin/reportbug, reportbug/ui/text_ui.py, share/presubj
+    - append a notice to every 'presubj' script shown in UI text that 'q' is
+      probably the key to press to exit the pager (updating reportbug 'presubj'
+      script to remove that notice); thanks to Chris Walker for the report;
+      Closes: #488414
 
- -- Sandro Tosi <morph at debian.org>  Sun, 04 Apr 2010 23:38:44 +0200
+ -- Sandro Tosi <morph at debian.org>  Mon, 05 Apr 2010 15:04:25 +0200
 
 reportbug (4.11) unstable; urgency=low
 
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index d698227..ae01b3f 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -958,10 +958,12 @@ def search_bugs(hierarchyfull, bts, queryonly, mirrors,
             scount = scount + 1
     return "FilterEnd"
 
-def display_report(text, use_pager=True):
+def display_report(text, use_pager=True, presubj=False):
     if not use_pager:
         ewrite(text)
         return
+    elif presubj:
+        text += "\n(You may need to press 'q' to exit your pager and continue using\nreportbug at this point.)"
 
     pager = os.environ.get('PAGER', 'sensible-pager')
     try:
diff --git a/share/presubj b/share/presubj
index daeb79a..9be4c92 100644
--- a/share/presubj
+++ b/share/presubj
@@ -36,7 +36,4 @@ GTK+ UI: There are some situation when the GTK+ stack crashes,
    are bugs in GTK+ or misconfigurations (for example, using 'testing'
    suite can lead to such errors) on the current machine. Do not
    report bugs against reportbug in such situations but consult users
-   support forums.
-
-(You may need to press 'q' to exit your pager and continue using
-reportbug at this point. Doesn't apply to GTK+ UI.)
+   support forums.
\ No newline at end of file

-- 
Reportbug - reports bugs in the Debian distribution