mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Handle stupid weird case where the manifest file disappeared yet the app folder is still there ...
This commit is contained in:
parent
175de8f4f5
commit
08f9091257
1 changed files with 7 additions and 2 deletions
|
@ -116,7 +116,11 @@ def app_list(full=False):
|
||||||
"""
|
"""
|
||||||
out = []
|
out = []
|
||||||
for app_id in sorted(_installed_apps()):
|
for app_id in sorted(_installed_apps()):
|
||||||
app_info_dict = app_info(app_id, full=full)
|
try:
|
||||||
|
app_info_dict = app_info(app_id, full=full)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error("Failed to read info for %s : %s" % (app_id, e))
|
||||||
|
continue
|
||||||
app_info_dict["id"] = app_id
|
app_info_dict["id"] = app_id
|
||||||
out.append(app_info_dict)
|
out.append(app_info_dict)
|
||||||
|
|
||||||
|
@ -131,6 +135,7 @@ def app_info(app, full=False):
|
||||||
raise YunohostError('app_not_installed', app=app, all_apps=_get_all_installed_apps_id())
|
raise YunohostError('app_not_installed', app=app, all_apps=_get_all_installed_apps_id())
|
||||||
|
|
||||||
local_manifest = _get_manifest_of_app(os.path.join(APPS_SETTING_PATH, app))
|
local_manifest = _get_manifest_of_app(os.path.join(APPS_SETTING_PATH, app))
|
||||||
|
|
||||||
settings = _get_app_settings(app)
|
settings = _get_app_settings(app)
|
||||||
|
|
||||||
ret = {
|
ret = {
|
||||||
|
@ -2026,7 +2031,7 @@ def _get_manifest_of_app(path):
|
||||||
elif os.path.exists(os.path.join(path, "manifest.json")):
|
elif os.path.exists(os.path.join(path, "manifest.json")):
|
||||||
return read_json(os.path.join(path, "manifest.json"))
|
return read_json(os.path.join(path, "manifest.json"))
|
||||||
else:
|
else:
|
||||||
return None
|
raise YunohostError("There doesn't seem to be any manifest file in %s ... It looks like an app was not correctly installed/removed." % path, raw_msg=True)
|
||||||
|
|
||||||
|
|
||||||
def _get_git_last_commit_hash(repository, reference='HEAD'):
|
def _get_git_last_commit_hash(repository, reference='HEAD'):
|
||||||
|
|
Loading…
Add table
Reference in a new issue