app_map()

This commit is contained in:
Kload 2013-03-02 11:20:55 +01:00
parent 5b2baddc7d
commit da6509aeb0

View file

@ -164,17 +164,15 @@ def app_map():
domain_app_list.append(conf[:len(conf)-9]) domain_app_list.append(conf[:len(conf)-9])
for installed_app in domain_app_list: for installed_app in domain_app_list:
try: with open(apps_setting_path + installed_app +'/app_settings.yml') as f:
with open(apps_setting_path + installed_app +'/app_settings.yml') as f: app_settings = yaml.load(f)
app_settings = yaml.load(f)
if int(app_settings['instance']) > 1: if int(app_settings['instance']) > 1:
app_name = app_settings['label'] +' ('+ app_settings['uid'] +''+ str(app_settings['instance']) +')' app_name = app_settings['label'] +' ('+ app_settings['uid'] +''+ str(app_settings['instance']) +')'
else: else:
app_name = app_settings['label'] +' ('+ app_settings['uid'] +')' app_name = app_settings['label'] +' ('+ app_settings['uid'] +')'
result[domain][app_settings['path']] = app_name
except IOError: result[domain][app_settings['path']] = app_name
pass
return result return result