diff --git a/WAPT/control b/WAPT/control index e6a437e..12bf5a8 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-fusioninventory -version : 2.5-2 +version : 2.5.1-2 architecture : all section : base priority : optional diff --git a/fusioninventory-agent_windows-x64_2.5.1.exe b/fusioninventory-agent_windows-x64_2.5.1.exe new file mode 100644 index 0000000..15ecc12 --- /dev/null +++ b/fusioninventory-agent_windows-x64_2.5.1.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81c6f082c4aab64bbea106c4b388403c7874e4739aeae06c5063b136e45ac131 +size 10453758 diff --git a/fusioninventory-agent_windows-x64_2.5.exe b/fusioninventory-agent_windows-x64_2.5.exe deleted file mode 100644 index 43a0d38..0000000 --- a/fusioninventory-agent_windows-x64_2.5.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4b8bb02d2e9a1238414096b085fc13181dade6ae1bbd46588b699817f38209e -size 9680495 diff --git a/fusioninventory-agent_windows-x86_2.5.1.exe b/fusioninventory-agent_windows-x86_2.5.1.exe new file mode 100644 index 0000000..3debd1b --- /dev/null +++ b/fusioninventory-agent_windows-x86_2.5.1.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9709d46bc2a88c78420a17d76c8c9ba9eeb137ca2abd938a8972e7eb5393b204 +size 10403441 diff --git a/fusioninventory-agent_windows-x86_2.5.exe b/fusioninventory-agent_windows-x86_2.5.exe deleted file mode 100644 index ee6636b..0000000 --- a/fusioninventory-agent_windows-x86_2.5.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57512aa6c155bdbe74c57def07c1330ecec0eec05062b14b22f281fff5289fde -size 9240438 diff --git a/setup.py b/setup.py index 787df10..3d66577 100644 --- a/setup.py +++ b/setup.py @@ -36,17 +36,19 @@ def update_package(): version = latest['tag_name'] pe = PackageEntry(); control = pe.load_control_from_wapt('.') + bin_found = [] for arch in ['86','64']: for asset in latest['assets']: if asset['name'] == 'fusioninventory-agent_windows-x%s_%s.exe' % (arch, version) and not isfile('fusioninventory-agent_windows-x%s_%s.exe' % (arch, version)): url = asset['browser_download_url'] print('Downloading FusionInventory Agent %s for x%s from %s' % (version,arch,url)) wget(url,'fusioninventory-agent_windows-x%s_%s.exe' % (arch, version)) + bin_found.append(arch) for file in glob.glob('fusioninventory-agent_windows-%s_*.exe' % arch): if file != 'fusioninventory-agent_windows-x%s_%s.exe' % (arch, version): print('Removing %s' % file) remove_file(file) - if Version(version) > Version(control['version'].split('-',1)[0]): + if Version(version) > Version(control['version'].split('-',1)[0]) and '86' in bin_found and '64' in bin_found: print('Updating control file with new version %s' % version) pe.version = version + '-0' pe.maturity = 'PREPROD'