Browse Source

Follow-up to rev. git 307e4bb62b: Restore code which was needed :-(

master Release_2.1.0-RC12
Jorg Knobloch 1 year ago
parent
commit
d14ccc81ab
2 changed files with 11 additions and 1 deletions
  1. +10
    -0
      enigmail.py
  2. +1
    -1
      pEp_import.py

+ 10
- 0
enigmail.py View File

@ -1,12 +1,22 @@
# coding=UTF-8
import sys
import os
import thunderbird
import re
from subprocess import Popen, PIPE
import xml.etree.ElementTree as ET
if sys.platform == 'darwin':
from platform_macOS import *
elif sys.platform == 'win32':
from platform_Windows import *
else:
from platform_Linux import *
gpg = gpg_executable(thunderbird_base)


+ 1
- 1
pEp_import.py View File

@ -40,7 +40,7 @@ verbose = 0
try:
import enigmail
except:
except GnuPGNotFound:
print "--- GnuPG not found (despite Enigmail being installed?)"
print "*** Import from Enigmail into pEp: Nothing to do! ***"
sys.exit(0)


Loading…
Cancel
Save