QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-receive-appmenus: use old icons when retrieval fails (#836)

Browse Source
This commit is contained in:
Wojciech Zygmunt Porczyk 2014-05-07 14:54:59 +02:00
parent bad449f235
commit c6f24d8ba8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
appmenus-scripts/qubes-receive-appmenus
View File

@ -231,14 +231,19 @@ def main():
# the following line is used for time comparison # the following line is used for time comparison
# del new_appmenus[appmenu_file]['Icon'] # del new_appmenus[appmenu_file]['Icon']
icondest = os.path.join(vm.appmenus_template_icons_dir,
os.path.splitext(appmenu_file)[0] + '.png')
try: try:
qubes.imgconverter.Image.get_xdg_icon_from_vm(vm, qubes.imgconverter.Image.get_xdg_icon_from_vm(vm,
new_appmenus[appmenu_file]['Icon']).save( new_appmenus[appmenu_file]['Icon']).save(icondest)
os.path.join(vm.appmenus_template_icons_dir,
os.path.splitext(appmenu_file)[0] + '.png'))
except Exception, e: except Exception, e:
print >> sys.stderr, '----> Failed to get icon for {0}: {1!s}'.format(appmenu_file, e) print >> sys.stderr, '----> Failed to get icon for {0}: {1!s}'.format(appmenu_file, e)
del new_appmenus[appmenu_file]['Icon']
if os.path.exists(icondest):
print >> sys.stderr, '-----> Found old icon, using it instead'
else:
del new_appmenus[appmenu_file]['Icon']
create_template(os.path.join(vm.appmenus_templates_dir, appmenu_file), create_template(os.path.join(vm.appmenus_templates_dir, appmenu_file),
new_appmenus[appmenu_file]) new_appmenus[appmenu_file])