From e21453143818389060bf0bd6cfa627c11a63ede5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Fri, 11 Aug 2017 05:41:14 +0200
Subject: New upstream release; refresh patches

---
 debian/patches/0105-try_mail.diff | 68 +++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

(limited to 'debian/patches/0105-try_mail.diff')

diff --git a/debian/patches/0105-try_mail.diff b/debian/patches/0105-try_mail.diff
index d390b6d..bc62ef1 100644
--- a/debian/patches/0105-try_mail.diff
+++ b/debian/patches/0105-try_mail.diff
@@ -12,41 +12,41 @@ Index: trunk/mwc.py
 ===================================================================
 --- trunk.orig/mwc.py
 +++ trunk/mwc.py
-@@ -225,16 +225,27 @@ def sendmail(receiver, subject, content,
-         mail['Subject'] = Header(subject, defaultEncoding)
+@@ -232,16 +232,28 @@ def sendmail(receiver, subject, content,
+     mail['Subject'] = Header(subject, defaultEncoding)
  
-         # initialize session once, not each time this method gets called
--        if mailsession is None:
--                mailsession = smtplib.SMTP(config.smtphost, config.smtpport)
--                if config.useTLS:
--                        mailsession.ehlo()
--                        mailsession.starttls()
--                if config.smtpusername is not None:
--                    mailsession.login(config.smtpusername, config.smtppwd)
+     # initialize session once, not each time this method gets called
+-    if mailsession is None:
+-        mailsession = smtplib.SMTP(config.smtphost, config.smtpport)
+-        if config.useTLS:
+-            mailsession.ehlo()
+-            mailsession.starttls()
+-        if config.smtpusername is not None:
+-            mailsession.login(config.smtpusername, config.smtppwd)
 -
--        mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
--
-+        #
-+        # add try / except to open mailsession
-+        #
-+        try:
-+    		if mailsession is None:
-+            		mailsession = smtplib.SMTP(config.smtphost, config.smtpport)
-+            		if config.useTLS:
-+                    		mailsession.ehlo()
-+                    		mailsession.starttls()
-+            		mailsession.login(config.smtpusername, config.smtppwd)
-+        #
-+        # add try / except to send mail
-+        #
-+        except:
-+    		print('Error: Open smtp-session')
-+    		exit(4)
-+    	try:
-+    		mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
-+        except:
-+    		print('Error: sendmail')
-+    		exit(5)
+-    mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
+ 
++    #
++    # add try / except to open mailsession
++    #
++    try:
++	if mailsession is None:
++	    mailsession = smtplib.SMTP(config.smtphost, config.smtpport)
++	    if config.useTLS:
++            	mailsession.ehlo()
++            	mailsession.starttls()
++        	mailsession.login(config.smtpusername, config.smtppwd)
++    #
++    # add try / except to send mail
++    #
++    except:
++    	print('Error: Open smtp-session')
++    	exit(4)
++    try:
++    	mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
++    except:
++    	print('Error: sendmail')
++    	exit(5)
  
  # returns a list of all content that is stored locally for a specific site
- def getFileContents(shortname):
+ def getStoredHashes(shortname):
-- 
cgit v1.2.3