qubes: fix qubes-create regression
Previous commit, which changed the handling of qubes.xml again, broke bootstrapping.
This commit is contained in:
		
							parent
							
								
									729c28281b
								
							
						
					
					
						commit
						b54305bff1
					
				| @ -1278,7 +1278,7 @@ class Qubes(PropertyHolder): | |||||||
|         ''' |         ''' | ||||||
| 
 | 
 | ||||||
|         while True: |         while True: | ||||||
|             fd_old = os.open(self._store, os.O_RDWR) # no O_CREAT |             fd_old = os.open(self._store, os.O_RDWR | os.O_CREAT) | ||||||
|             if os.name == 'posix': |             if os.name == 'posix': | ||||||
|                 fcntl.lockf(fd_old, fcntl.LOCK_EX) |                 fcntl.lockf(fd_old, fcntl.LOCK_EX) | ||||||
|             elif os.name == 'nt': |             elif os.name == 'nt': | ||||||
| @ -1308,7 +1308,6 @@ class Qubes(PropertyHolder): | |||||||
|         # before all buffers are flushed |         # before all buffers are flushed | ||||||
|         fh_new.close() |         fh_new.close() | ||||||
|         os.close(fd_old) |         os.close(fd_old) | ||||||
|         del fh |  | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|     @classmethod |     @classmethod | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Wojtek Porczyk
						Wojtek Porczyk