Merge branch 'master' of ssh://git.0x50.de:48653/atomstrom

Conflicts:
	atomstrom.py
This commit is contained in:
Ronald Schaten 2013-04-05 21:47:01 +02:00
commit a9e5a27627

View File

@ -71,8 +71,8 @@ def mail_daily_digest(session, sender, receiver, prefix):
if prefix != '': if prefix != '':
subject = '%s %s' % (prefix, subject) subject = '%s %s' % (prefix, subject)
send_mail(sender, receiver, subject, body) send_mail(sender, receiver, subject, body)
#for feed, feedinfo, entry in entries: for feed, feedinfo, entry in entries:
# entry.sent = datetime.now() entry.sent = datetime.now()
else: else:
print 'no unmailed digest-entries found... not sending mail.' print 'no unmailed digest-entries found... not sending mail.'