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

Merge remote-tracking branch 'woju/master' into appicons

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-01-31 03:11:38 +01:00
commit ad522b178b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appmenus-scripts/qubes-core-appmenus.py
View File

@ -121,6 +121,7 @@ def QubesVm_appicons_create(self, srcdir=None):
self.label.color) self.label.color)
def QubesVm_appicons_remove(self): def QubesVm_appicons_remove(self):
if not os.path.exists(self.appmenus_icons_dir): return
for icon in os.listdir(self.appmenus_icons_dir): for icon in os.listdir(self.appmenus_icons_dir):
os.unlink(os.path.join(self.appmenus_icons_dir, icon)) os.unlink(os.path.join(self.appmenus_icons_dir, icon))

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

@ -216,6 +216,9 @@ def main():
if not os.path.exists(vm.appmenus_templates_dir): if not os.path.exists(vm.appmenus_templates_dir):
os.mkdir(vm.appmenus_templates_dir) os.mkdir(vm.appmenus_templates_dir)
if not os.path.exists(vm.appmenus_template_icons_dir):
os.mkdir(vm.appmenus_template_icons_dir)
# Create new/update existing templates # Create new/update existing templates
if options.verbose: if options.verbose:
print >> sys.stderr, "--> Got {0} appmenus, storing to disk".format(str(len(new_appmenus))) print >> sys.stderr, "--> Got {0} appmenus, storing to disk".format(str(len(new_appmenus)))