Disroot
/
gpg-lacre
9
15
Fork 4
Code Issues 30 Pull Requests 2 Releases 2 Wiki Activity

Fix minor cron.py issues #64

Merged
pfm merged 13 commits from fix-cron-script into master 2022-05-06 19:25:13 +02:00
Conversation 2 Commits 13 Files Changed 7 +3 -1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a34249090 - Show all commits

2
GnuPG/__init__.py
View File

@ -102,6 +102,8 @@ def confirm_key( content, email ):
# adds a key and ensures it has the given email address # adds a key and ensures it has the given email address
def add_key( keyhome, content ): def add_key( keyhome, content ):
if type(content) == 'str':
content = bytes(content, sys.getdefaultencoding())
p = subprocess.Popen( build_command(keyhome, '--import', '--batch'), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE ) p = subprocess.Popen( build_command(keyhome, '--import', '--batch'), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
p.communicate(input=content) p.communicate(input=content)
p.wait() p.wait()

2
gpg-mailgate-web/cron.py
View File

@ -25,7 +25,7 @@ import MySQLdb
import smtplib import smtplib
import markdown import markdown
import syslog import syslog
from email.MIMEText import MIMEText from email.mime.text import MIMEText
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
def appendLog(msg): def appendLog(msg):