YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove old 'list of dict' style, only use 'list of 2-tuples'

Browse source
This commit is contained in:
Alexandre Aubin 2018-08-02 16:22:36 +02:00
parent 6d6d778a7b
commit 3bd14aa6fd
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/yunohost/certificate.py
View file

@ -284,7 +284,7 @@ def _certificate_install_letsencrypt(auth, domain_list, force=False, no_checks=F
# Actual install steps # Actual install steps
for domain in domain_list: for domain in domain_list:
uo = UnitOperation('letsencrypt_cert_install', [{'domain': domain}], uo = UnitOperation('letsencrypt_cert_install', [('domain': domain)],
args={'force': force, 'no_checks': no_checks, args={'force': force, 'no_checks': no_checks,
'staging': staging}) 'staging': staging})
uo.start() uo.start()
@ -385,7 +385,7 @@ def certificate_renew(auth, domain_list, force=False, no_checks=False, email=Fal
# Actual renew steps # Actual renew steps
for domain in domain_list: for domain in domain_list:
uo = UnitOperation('letsencrypt_cert_renew', [{'domain': domain}], uo = UnitOperation('letsencrypt_cert_renew', [('domain': domain)],
args={'force': force, 'no_checks': no_checks, args={'force': force, 'no_checks': no_checks,
'staging': staging, 'email': email}) 'staging': staging, 'email': email})
uo.start() uo.start()

3
src/yunohost/log.py
View file

@ -354,10 +354,7 @@ class UnitOperation(object):
name = [self.started_at.strftime("%Y%m%d-%H%M%S")] name = [self.started_at.strftime("%Y%m%d-%H%M%S")]
name += [self.operation] name += [self.operation]
if self.related_to: if self.related_to:
if isinstance(self.related_to[0], tuple):
name += [self.related_to[0][1]] name += [self.related_to[0][1]]
else:
name += self.related_to[0].values()
self._name = '-'.join(name) self._name = '-'.join(name)
return self._name return self._name