From da6509aeb06c57119e17d988a20d024c74a391be Mon Sep 17 00:00:00 2001 From: Kload Date: Sat, 2 Mar 2013 11:20:55 +0100 Subject: [PATCH] app_map() --- yunohost_app.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/yunohost_app.py b/yunohost_app.py index f0aaf91a..e17db37b 100644 --- a/yunohost_app.py +++ b/yunohost_app.py @@ -164,17 +164,15 @@ def app_map(): domain_app_list.append(conf[:len(conf)-9]) for installed_app in domain_app_list: - try: - with open(apps_setting_path + installed_app +'/app_settings.yml') as f: - app_settings = yaml.load(f) + with open(apps_setting_path + installed_app +'/app_settings.yml') as f: + app_settings = yaml.load(f) - if int(app_settings['instance']) > 1: - app_name = app_settings['label'] +' ('+ app_settings['uid'] +' n°'+ str(app_settings['instance']) +')' - else: - app_name = app_settings['label'] +' ('+ app_settings['uid'] +')' - result[domain][app_settings['path']] = app_name - except IOError: - pass + if int(app_settings['instance']) > 1: + app_name = app_settings['label'] +' ('+ app_settings['uid'] +' n°'+ str(app_settings['instance']) +')' + else: + app_name = app_settings['label'] +' ('+ app_settings['uid'] +')' + + result[domain][app_settings['path']] = app_name return result