Merge branch 'master' of ssh://git.0x50.de:48653/atomstrom
Conflicts: atomstrom.py
This commit is contained in:
		@@ -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.'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user