diff --git a/WAPT/control b/WAPT/control index e8b31fd..a9e3add 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-thunderbird-sogo-addons -version : 60.0.0-3 +version : 60.0.0-6 architecture : all section : base priority : optional diff --git a/setup.py b/setup.py index 28219c2..7924325 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,5 @@ # -*- coding: UTF-8 -*- from setuphelpers import * -import json -from cryptography.fernet import Fernet import os from jinja2 import Environment, FileSystemLoader @@ -14,8 +12,10 @@ variables = { # Read local variables file if available if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')): print('Reading local encrypted variables file') + from cryptography.fernet import Fernet + import yaml f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read()) - variables.update(json.loads(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read()))) + variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read()))) def install(): connector_version = control['version'].split('-',1)[0]