From: Dylan William Hardison Date: Tue, 20 Feb 2018 13:56:48 +0000 (-0500) Subject: no bug - tie secbugstats to bugzilla email (#404) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dda92c6a770c6d63664dab5add07ff3e96996a9;p=thirdparty%2Fbugzilla.git no bug - tie secbugstats to bugzilla email (#404) --- diff --git a/contrib/secbugstats/bin/gather.sh b/contrib/secbugstats/bin/gather.sh index 678752762..fd7de7620 100755 --- a/contrib/secbugstats/bin/gather.sh +++ b/contrib/secbugstats/bin/gather.sh @@ -54,5 +54,5 @@ echo "[end graph.py]" # # Email the report echo "[sendstats.py `date +%Y-%m-%d\ %T`]" -$SCRIPTS_DIR/sendstats.py +$SCRIPTS_DIR/sendstats.py | perl scripts/sendmail.pl echo "[end sendstats.py]" diff --git a/contrib/secbugstats/bin/sendstats.py b/contrib/secbugstats/bin/sendstats.py index 32d296533..2df8bfd6b 100755 --- a/contrib/secbugstats/bin/sendstats.py +++ b/contrib/secbugstats/bin/sendstats.py @@ -293,15 +293,4 @@ if img: msgImage.add_header("Content-ID", "") msgRoot.attach(msgImage) -# if console is chosen, print only to the console -if "--console" in sys.argv: - print "\n", msgRoot.as_string() -# print out only HTML body -elif "--html" in sys.argv: - print "\n", body -# send out the mail -else: - s = smtplib.SMTP(SMTP_HOST, SMTP_PORT) - # s = smtplib.SMTP_SSL(SMTP_HOST, SMTP_PORT) - # s.login(LDAP_USER, LDAP_PASS) - s.sendmail(EMAIL_FROM, EMAIL_TO, msgRoot.as_string()) +print msgRoot.as_string()