Browse Source

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

tags/4.12
Sandro Tosi 11 years ago
parent
commit
8af70aabab
4 changed files with 11 additions and 7 deletions
  1. +1
    -1
      bin/reportbug
  2. +6
    -1
      debian/changelog
  3. +3
    -1
      reportbug/ui/text_ui.py
  4. +1
    -4
      share/presubj

+ 1
- 1
bin/reportbug View File

@@ -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)


+ 6
- 1
debian/changelog View File

@@ -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@debian.org> Sun, 04 Apr 2010 23:38:44 +0200
-- Sandro Tosi <morph@debian.org> Mon, 05 Apr 2010 15:04:25 +0200

reportbug (4.11) unstable; urgency=low



+ 3
- 1
reportbug/ui/text_ui.py View File

@@ -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:


+ 1
- 4
share/presubj View File

@@ -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.

Loading…
Cancel
Save