Fix update_package logic
This commit is contained in:
parent
f1e77fc6f1
commit
ab33857304
30
WAPT/control
30
WAPT/control
|
@ -5,28 +5,28 @@ section : base
|
||||||
priority : optional
|
priority : optional
|
||||||
maintainer : Daniel Berteaud
|
maintainer : Daniel Berteaud
|
||||||
description : Clean and optimize Windows
|
description : Clean and optimize Windows
|
||||||
depends :
|
depends :
|
||||||
conflicts :
|
conflicts :
|
||||||
maturity : PROD
|
maturity : PROD
|
||||||
locale : all
|
locale : all
|
||||||
target_os : windows
|
target_os : windows
|
||||||
min_os_version : 5.1
|
min_os_version : 5.1
|
||||||
max_os_version :
|
max_os_version :
|
||||||
min_wapt_version : 1.5
|
min_wapt_version : 1.5
|
||||||
sources :
|
sources :
|
||||||
installed_size :
|
installed_size :
|
||||||
impacted_process : ccleaner.exe,ccleaner64.exe
|
impacted_process : ccleaner.exe,ccleaner64.exe
|
||||||
description_fr : Outils de nettoyage et d'optimisation de Windows
|
description_fr : Outils de nettoyage et d'optimisation de Windows
|
||||||
description_pl :
|
description_pl :
|
||||||
description_de :
|
description_de :
|
||||||
description_es :
|
description_es :
|
||||||
audit_schedule :
|
audit_schedule :
|
||||||
editor : Piriform
|
editor : Piriform
|
||||||
keywords :
|
keywords :
|
||||||
licence :
|
licence :
|
||||||
homepage : http://www.piriform.com/ccleaner/
|
homepage : http://www.piriform.com/ccleaner/
|
||||||
package_uuid :
|
package_uuid :
|
||||||
signer : Daniel Berteaud
|
signer : Daniel Berteaud
|
||||||
signer_fingerprint:
|
signer_fingerprint:
|
||||||
signature_date :
|
signature_date :
|
||||||
signed_attributes :
|
signed_attributes :
|
13
setup.py
13
setup.py
|
@ -52,12 +52,13 @@ def session_setup():
|
||||||
|
|
||||||
def update_package():
|
def update_package():
|
||||||
|
|
||||||
|
control = PackageEntry().load_control_from_wapt ('.')
|
||||||
page = requests.get('https://www.ccleaner.com/fr-fr/ccleaner/download/slim',headers={'User-Agent':'Mozilla/5.0 (Windows NT 6.1; Win64; x64)'}).text
|
page = requests.get('https://www.ccleaner.com/fr-fr/ccleaner/download/slim',headers={'User-Agent':'Mozilla/5.0 (Windows NT 6.1; Win64; x64)'}).text
|
||||||
bs = BeautifulSoup.BeautifulSoup(page)
|
bs = BeautifulSoup.BeautifulSoup(page)
|
||||||
download = bs.find('p', attrs={"class": u"fs-13"}).a["href"]
|
download = bs.find('p', attrs={"class": u"fs-13"}).a["href"]
|
||||||
filename = download.rsplit('/',1)[1]
|
filename = download.rsplit('/',1)[1]
|
||||||
|
|
||||||
# on ne telecharge que si on ne l'a pas deja
|
# Only download if needed
|
||||||
if not isfile(filename):
|
if not isfile(filename):
|
||||||
wget(download, filename)
|
wget(download, filename)
|
||||||
else:
|
else:
|
||||||
|
@ -69,12 +70,10 @@ def update_package():
|
||||||
remove_file(fn)
|
remove_file(fn)
|
||||||
|
|
||||||
vers = get_file_properties(filename)['ProductVersion']
|
vers = get_file_properties(filename)['ProductVersion']
|
||||||
os.chdir(os.path.dirname(__file__))
|
|
||||||
from waptpackage import PackageEntry
|
if Version(vers) > Version(control['version'].split('-',1)[0]):
|
||||||
pe = PackageEntry()
|
control.version = vers + '-0'
|
||||||
pe.load_control_from_wapt(os.getcwd())
|
control.save_control_to_wapt(os.getcwd())
|
||||||
pe.version = vers + '-0'
|
|
||||||
pe.save_control_to_wapt(os.getcwd())
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
Loading…
Reference in New Issue