Browse Source

print the "If you want to provide additional information" text only if an email is specified in sysinfo, this prevents a crash if we are sending reports to a non-debbugs instance; Closes: #789332

master
Sandro Tosi 6 years ago
parent
commit
d7d7fc111c
  1. 5
      debian/changelog
  2. 2
      reportbug/submit.py

5
debian/changelog

@ -22,6 +22,9 @@ reportbug (6.6.6) UNRELEASED; urgency=medium
Closes: #546914
- dont escape a single dot line surrounded by newlines (the End-Of-Message
in SMTP), it is done by sendmail() automatically; Closes: #808742
- print the "If you want to provide additional information" text only if an
email is specified in sysinfo, this prevents a crash if we are sending
reports to a non-debbugs instance; Closes: #789332
* debian/control
- add dep on 'file' for python-reportbug; Closes: #803764
* reportbug/ui/text_ui.py
@ -34,7 +37,7 @@ reportbug (6.6.6) UNRELEASED; urgency=medium
* reportbug/urlutils.py
- remove handling of X11BROWSER and CONSOLEBROWSER, obsolete
-- Sandro Tosi <morph@debian.org> Fri, 01 Jan 2016 14:52:18 +0000
-- Sandro Tosi <morph@debian.org> Fri, 01 Jan 2016 15:10:09 +0000
reportbug (6.6.5) unstable; urgency=medium

2
reportbug/submit.py

@ -507,7 +507,7 @@ def send_report(body, attachments, mua, fromaddr, sendto, ccaddr, bccaddr,
for address in cclist:
ewrite(' %s\n', decode_email_header(address))
if not (exinfo or kudos) and rtype == 'debbugs' and sysinfo and not failed \
if not (exinfo or kudos) and rtype == 'debbugs' and sysinfo and 'email' in sysinfo and not failed \
and mailing:
ewrite('\n')
ui.final_message(

Loading…
Cancel
Save