[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-45-g7a3eca8
Sandro Tosi
morph at debian.org
Sun Aug 28 20:35:53 UTC 2011
The following commit has been merged in the master branch:
commit 7a3eca8fe455d62a135717abb35f5465984bde01
Author: Sandro Tosi <morph at debian.org>
Date: Sun Aug 28 22:34:08 2011 +0200
we don't need to create an empty file under /var/tmp in case a smarthost is used; thanks to Torquil Macdonald Sørensen for the report and support in debugging; Closes: #570385
diff --git a/debian/changelog b/debian/changelog
index 7d70f92..1a96f57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ reportbug (6.2) UNRELEASED; urgency=low
- if can't write to the selected output file, then don't crash but just
select a temporary file instead; thanks to David A. Parker for the report;
Closes: #617636
+ - we don't need to create an empty file under /var/tmp in case a smarthost
+ is used; thanks to Torquil Macdonald Sørensen for the report and support
+ in debugging; Closes: #570385
* reportbug/ui/text_ui.py
- don't try to decode a unicode string; thanks to Vincent Bernat for the
report; Closes: #638429
@@ -59,7 +62,7 @@ reportbug (6.2) UNRELEASED; urgency=low
* conf/reportbug.conf, man/reportbug.conf.5
- complete manpage and example config file with all the accepted options
- -- Sandro Tosi <morph at debian.org> Sun, 28 Aug 2011 16:16:48 +0200
+ -- Sandro Tosi <morph at debian.org> Sun, 28 Aug 2011 22:32:26 +0200
reportbug (6.1) unstable; urgency=low
diff --git a/reportbug/submit.py b/reportbug/submit.py
index c44ba94..2f46d18 100644
--- a/reportbug/submit.py
+++ b/reportbug/submit.py
@@ -311,7 +311,7 @@ def send_report(body, attachments, mua, fromaddr, sendto, ccaddr, bccaddr,
pipe = sys.stdout
elif mua:
pipe, filename = TempFile(prefix=tfprefix, dir=draftpath)
- elif outfile or not mta or not os.path.exists(mta):
+ elif outfile or not ((mta and os.path.exists(mta)) or smtphost):
msgname = outfile or ('/var/tmp/%s.bug' % package)
if os.path.exists(msgname):
try:
--
Reportbug - reports bugs in the Debian distribution
More information about the Reportbug-commits
mailing list