From 172a54a51790afa37a91825e4baf79ab72c318d7 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 10 Dec 2018 18:37:46 +0100 Subject: [PATCH] Fix version --- WAPT/control | 4 ++-- setup.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WAPT/control b/WAPT/control index 1b99ee6..402280b 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,11 +1,11 @@ package : fws-thunderbird-sogo-addons -version : 2 +version : 60.0.0-1 architecture : all section : base priority : optional maintainer : Daniel Berteaud description : SOGo addons for Thunderbird -depends : fws-thunderbird,fws-7zip,fws-thunderbird-config +depends : fws-thunderbird-config,fws-7zip conflicts : maturity : DEV locale : diff --git a/setup.py b/setup.py index 28ecc01..98ba243 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,9 @@ if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(m 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()))) -connector_version = control.version.split('-',1)[0] -integrator_version = connector_version - def install(): + connector_version = control['version'].split('-',1)[0] + integrator_version = connector_version for extension in ['connector','integrator']: if isdir(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension)): remove_tree(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension)) @@ -51,6 +50,8 @@ def uninstall(): remove_tree(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension)) def audit(): + connector_version = control['version'].split('-',1)[0] + integrator_version = connector_version try: run('type "%s" | find /I "em:version=" | find "%s"' % (makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca','install.rdf'), connector_version)) except: