Update to 2.24.0

WAPT/control

@@ -1,13 +1,15 @@
 package           : fws-git
-version           : 2.23.0-2
+version           : 2.24.0-1
 architecture      : all
 section           : base
 priority          : optional
+name              : 
+categories        : 
 maintainer        : Daniel Berteaud
 description       : Git for Windows
 depends           : fws-notepadplusplus
 conflicts         : 
-maturity          : PROD
+maturity          : PREPROD
 locale            : all
 target_os         : windows
 min_os_version    : 6.1
@@ -25,8 +27,12 @@ editor            :
 keywords          : 
 licence           : GPLv2+
 homepage          : https://gitforwindows.org/
-package_uuid      : 
+package_uuid      : fd2e4c25-f3bc-4e6b-84fe-4cf2feb1fae4
+valid_from        : 
+valid_until       : 
+forced_install_on : 
 signer            : Daniel Berteaud
-signer_fingerprint: 
+signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a
-signature_date    : 
+signature         : 3UMHqHfZmzgfAxgYoM2SI0/mBUhAPgX866go7uH5f60kOgLt7ltF9onW0aeVs2lzORReMyOQIDYrSyfWks38VSWjaGWUIwINa5vNqbpG70wct55s2OF6sCPwW2rTVYnB3FX9wuXNW7+u/MAADDgWZ1t7LqD7dGUXEkrvxfuR7LcIvlednQqqhMlO3i4EjnBX0tpEMjco5Z3NKpK8FmH23mQVWAwvXYWifavQLmMlXFrRk/HMDA0yopvrAcXtB5uQnosKz21LcBOHF6Avoi/nI3eXTYs4n+NVSCE9nClWGgabwZXTgKZFOGilPaJWN3yZoHwQXZiJvkYyOvgVNhOUoQ==
-signed_attributes : 
+signature_date    : 2019-11-05T13:24:57.951000
+signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes

setup.py

@@ -17,24 +17,26 @@ def install():
 
 def update_package():
     import re
-    print('Updating Git Package')
+
     latest = json.loads(requests.get('https://api.github.com/repos/git-for-windows/git/releases/latest').text.encode('utf-8'))
-    version = re.search('v(.*)\.windows\.1', latest['tag_name']).group(1)
+    latest_version = re.search('v(.*)\.windows\.1', latest['tag_name']).group(1)
     pe = PackageEntry();
     control = pe.load_control_from_wapt('.')
-    print('Last version is %s' % version)
+    current_version = control['version'].split('-',1)[0]
+
+    if Version(latest_version) > Version(current_version):
+        print('Updateing package from %s to %s' % (current_version, latest_version))
         for arch in ['32','64']:
             for asset in latest['assets']:
-            if asset['name'] == 'Git-%s-%s-bit.exe' %(version,arch) and not isfile('Git-%s-%s-bit.exe' % (version,arch)):
+                if asset['name'] == 'Git-%s-%s-bit.exe' % (latest_version, arch) and not isfile('Git-%s-%s-bit.exe' % (latest_version, arch)):
                     url = asset['browser_download_url']
-                print('Downloading Git %s for win%s from %s' % (version,arch,url))
+                    print('Downloading Git %s for win%s from %s' % (latest_version, arch, url))
                     wget(url,asset['name'])
             for old in glob.glob(r'Git-*-%s-bit.exe' % arch):
-            if not old == 'Git-%s-%s-bit.exe' %(version,arch):
+                if not old == 'Git-%s-%s-bit.exe' % (latest_version, arch):
                     remove_file(old)
 
-    if Version(version) > Version(control['version'].split('-',1)[0]):
+        print('Updating control file with new version %s' % latest_version)
-        print('Updating control file with new version %s' % version)
+        pe.version = latest_version + '-0'
-        pe.version = version + '-0'
         pe.maturity = 'PREPROD'
         pe.save_control_to_wapt('.')