From 3ac39d20447d3928c4c9909c9bdeab37862e6186 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sat, 15 Dec 2018 12:08:18 +0100 Subject: [PATCH] Fix audit as now fusinv_servers is a list --- WAPT/control | 8 ++++---- setup.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WAPT/control b/WAPT/control index 764df8f..42a4f2d 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,9 +1,9 @@ package : fws-fusioninventory -version : 2.4.2-9 +version : 2.4.2-10 architecture : all section : base priority : optional -maintainer : Kevin Guerineau +maintainer : Daniel Berteaud description : FusionInventory is a computer inventory agent depends : conflicts : @@ -20,9 +20,9 @@ description_fr : FusionInventory est un agent d'inventaire d'ordinateurs description_pl : description_de : description_es : -audit_schedule : 4w +audit_schedule : 2d editor : -keywords : +keywords : inventory licence : GPLv2+ homepage : http://fusioninventory.org/ package_uuid : diff --git a/setup.py b/setup.py index 040d1d1..544f944 100644 --- a/setup.py +++ b/setup.py @@ -84,8 +84,8 @@ def audit(): print(r"key HKEY_LOCAL_MACHINE\SOFTWARE\FusionInventory-Agent\server doesn't exist") return "ERROR" val_server = registry_readstring(HKEY_LOCAL_MACHINE,makepath('SOFTWARE','FusionInventory-Agent'),'server') - if val_server != variables['fusinv_servers'] : - print("server config is not %, it's % instead" % (variables['fusinv_servers'], val_server) ) + if val_server != ','.join(variables['fusinv_servers']) : + print("server config is not %, it's % instead" % (','.join(variables['fusinv_servers']), val_server) ) return "WARNING" if 'fusinv_user' in variables and 'fusinv_pass' in variables: if not registry_readstring(HKEY_LOCAL_MACHINE,makepath('SOFTWARE','FusionInventory-Agent'),'user'):