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

appmenus: defer menu cache regeneration to speedup qvm-sync-appmenus

Browse Source 
Call "xdg-desktop-menu forceupdate" at the end of the process, not for
every single item.
This commit is contained in:
Marek Marczykowski-Górecki 2015-07-08 05:56:38 +02:00
parent 5e3fbb1623
commit cc7075ab65
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
appmenus-scripts/create-apps-for-appvm.sh
View File

@ -56,8 +56,9 @@ if [ "$SRCDIR" != "none" ]; then
fi fi
echo "--> Adding Apps to the Menu..." echo "--> Adding Apps to the Menu..."
LC_COLLATE=C xdg-desktop-menu install $APPSDIR/*.directory $APPSDIR/*.desktop LC_COLLATE=C xdg-desktop-menu install --noupdate $APPSDIR/*.directory $APPSDIR/*.desktop
if [ -n "$KDE_SESSION_UID" -a -z "$SKIP_CACHE_REBUILD" ]; then if [ -n "$KDE_SESSION_UID" -a -z "$SKIP_CACHE_REBUILD" ]; then
xdg-desktop-menu forceupdate
kbuildsycoca4 kbuildsycoca4
fi fi

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

@ -366,6 +366,7 @@ def main():
except Exception, e: except Exception, e:
print >> sys.stderr, "---> Failed to recreate appmenus for " \ print >> sys.stderr, "---> Failed to recreate appmenus for " \
"'{0}': {1}".format(child_vm.name, str(e)) "'{0}': {1}".format(child_vm.name, str(e))
subprocess.call(['xdg-desktop-menu', 'forceupdate'])
if 'KDE_SESSION_UID' in os.environ: if 'KDE_SESSION_UID' in os.environ:
subprocess.call(['kbuildsycoca4']) subprocess.call(['kbuildsycoca4'])
os.unsetenv('SKIP_CACHE_REBUILD') os.unsetenv('SKIP_CACHE_REBUILD')