Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
This commit is contained in:
		
						commit
						eb74c823d5
					
				| @ -1400,7 +1400,7 @@ class QubesVm(object): | |||||||
|         if verbose: |         if verbose: | ||||||
|             print >> sys.stderr, "--> Waiting for qubes-session..." |             print >> sys.stderr, "--> Waiting for qubes-session..." | ||||||
| 
 | 
 | ||||||
|         subprocess.call([qrexec_client_path, "-d", str(xid), "user:echo $$ >> /tmp/qubes-session-waiter; [ ! -f /tmp/qubes-session-env ] && exec sleep 365d"]) |         self.run('echo $$ >> /tmp/qubes-session-waiter; [ ! -f /tmp/qubes-session-env ] && exec sleep 365d', ignore_stderr=True, gui=False, wait=True) | ||||||
| 
 | 
 | ||||||
|         retcode = subprocess.call([qubes_clipd_path]) |         retcode = subprocess.call([qubes_clipd_path]) | ||||||
|         if retcode != 0: |         if retcode != 0: | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Joanna Rutkowska
						Joanna Rutkowska