mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
rename 'check' boolean to 'passed'
Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
This commit is contained in:
parent
807c1b3794
commit
34b191582a
1 changed files with 7 additions and 7 deletions
14
src/app.py
14
src/app.py
|
@ -588,10 +588,10 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False
|
||||||
upgrade_type = "UPGRADE_FULL"
|
upgrade_type = "UPGRADE_FULL"
|
||||||
|
|
||||||
# Check requirements
|
# Check requirements
|
||||||
for name, check, values, err in _check_manifest_requirements(
|
for name, passed, values, err in _check_manifest_requirements(
|
||||||
manifest, action="upgrade"
|
manifest, action="upgrade"
|
||||||
):
|
):
|
||||||
if not check:
|
if not passed:
|
||||||
if name == "ram":
|
if name == "ram":
|
||||||
_ask_confirmation(
|
_ask_confirmation(
|
||||||
"confirm_app_insufficient_ram", params=values, force=force
|
"confirm_app_insufficient_ram", params=values, force=force
|
||||||
|
@ -844,16 +844,16 @@ def app_manifest(app):
|
||||||
shutil.rmtree(extracted_app_folder)
|
shutil.rmtree(extracted_app_folder)
|
||||||
|
|
||||||
manifest["requirements"] = {}
|
manifest["requirements"] = {}
|
||||||
for name, check, values, err in _check_manifest_requirements(
|
for name, passed, values, err in _check_manifest_requirements(
|
||||||
manifest, action="install"
|
manifest, action="install"
|
||||||
):
|
):
|
||||||
if Moulinette.interface.type == "api":
|
if Moulinette.interface.type == "api":
|
||||||
manifest["requirements"][name] = {
|
manifest["requirements"][name] = {
|
||||||
"pass": check,
|
"pass": passed,
|
||||||
"values": values,
|
"values": values,
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
manifest["requirements"][name] = "ok" if check else m18n.n(err, **values)
|
manifest["requirements"][name] = "ok" if passed else m18n.n(err, **values)
|
||||||
|
|
||||||
return manifest
|
return manifest
|
||||||
|
|
||||||
|
@ -939,10 +939,10 @@ def app_install(
|
||||||
app_id = manifest["id"]
|
app_id = manifest["id"]
|
||||||
|
|
||||||
# Check requirements
|
# Check requirements
|
||||||
for name, check, values, err in _check_manifest_requirements(
|
for name, passed, values, err in _check_manifest_requirements(
|
||||||
manifest, action="install"
|
manifest, action="install"
|
||||||
):
|
):
|
||||||
if not check:
|
if not passed:
|
||||||
if name == "ram":
|
if name == "ram":
|
||||||
_ask_confirmation(
|
_ask_confirmation(
|
||||||
"confirm_app_insufficient_ram", params=values, force=force
|
"confirm_app_insufficient_ram", params=values, force=force
|
||||||
|
|
Loading…
Add table
Reference in a new issue