Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

dom0/qvm-tools/qvm-run

@@ -99,7 +99,7 @@ def vm_run_cmd(vm, cmd, options):
 
     if not vm.is_running():
         if not options.auto:
-            print "VM '{0}' is not running, please start it first, or use the '--auto' switch"
+            print "VM '{0}' is not running. Please start it first or use the '--auto' switch".format(vm.name)
             exit (1)
     	try:
             if options.verbose:

rpm_spec/core-appvm.spec

@@ -54,6 +54,7 @@ exit 0
 fi
 
 adduser --create-home user
+su user -c 'mkdir -p /home/user/.local/share'
 su user -c 'mkdir -p /home/user/.gnome2/nautilus-scripts'
 su user -c 'ln -s /usr/lib/qubes/qvm-copy-to-vm2.gnome /home/user/.gnome2/nautilus-scripts/"Copy to other AppVM"'
 su user -c 'ln -s /usr/bin/qvm-open-in-dvm2 /home/user/.gnome2/nautilus-scripts/"Open in DisposableVM"'