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

[yolo] Improve handling of situation where applist can't be fetched somehow...

Browse source
This commit is contained in:
Alexandre Aubin 2019-08-04 22:18:32 +02:00
parent 92c05a8d02
commit 817358ade4
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/app.py
View file

@ -251,14 +251,20 @@ def app_list(filter=None, raw=False, installed=False, with_backup=False):
for appslist in appslists.keys(): for appslist in appslists.keys():
json_path = "%s/%s.json" % (REPO_PATH, appslist) json_path = "%s/%s.json" % (REPO_PATH, appslist)
# If we don't have the json yet, try to fetch it
if not os.path.exists(json_path): if not os.path.exists(json_path):
app_fetchlist(name=appslist) app_fetchlist(name=appslist)
with open(json_path) as json_list: # If it now exist
for app, info in json.loads(str(json_list.read())).items(): if os.path.exists(json_path):
appslist_content = read_json(json_path)
for app, info in appslist_content.items():
if app not in app_dict: if app not in app_dict:
info['repository'] = appslist info['repository'] = appslist
app_dict[app] = info app_dict[app] = info
else:
logger.warning("Uh there's no data for applist '%s' ... (That should be just a temporary issue?)" % appslist)
# Get app list from the app settings directory # Get app list from the app settings directory
for app in os.listdir(APPS_SETTING_PATH): for app in os.listdir(APPS_SETTING_PATH):