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

[enh] Display friom which store come an app

Browse source
This commit is contained in:
zamentur 2016-02-14 03:26:12 +01:00
parent c199e681fd
commit cdaceb52b8
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/yunohost/app.py
View file

@ -148,8 +148,12 @@ def app_list(offset=None, limit=None, filter=None, raw=False):
for applist in applists: for applist in applists:
if '.json' in applist: if '.json' in applist:
list_name=applist.split('.json', 1)[0]
with open(repo_path +'/'+ applist) as json_list: with open(repo_path +'/'+ applist) as json_list:
app_dict.update(json.loads(str(json_list.read()))) list_content=json.loads(str(json_list.read()))
for k in list_content.keys():
list_content[k]['store']=list_name
app_dict.update(list_content)
for app in os.listdir(apps_setting_path): for app in os.listdir(apps_setting_path):
if app not in app_dict: if app not in app_dict:
@ -1026,7 +1030,7 @@ def _set_app_settings(app_id, app_settings):
Keyword arguments: Keyword arguments:
app_id -- The app id app_id -- The app id
app_settings -- A dictionary of app settings app_settings -- A dictionary of app settings
""" """
with open(os.path.join( with open(os.path.join(