Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage/reflink: reorder start() to be more readable

Browse Source 
This also makes slightly more sense in the exotic (and currently unused)
case of restarting a crashed snap_on_start *and* save_on_stop volume.
This commit is contained in:
Rusty Bird 2018-03-12 16:38:56 +00:00
parent 31810db977
commit 1743c76ca9
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/storage/reflink.py
View File

@ -151,12 +151,12 @@ class ReflinkVolume(qubes.storage.Volume):
return self.save_on_stop and os.path.exists(self._path_dirty) return self.save_on_stop and os.path.exists(self._path_dirty)
def start(self): def start(self):
if self.is_dirty(): # implies self.save_on_stop
return self
if self.snap_on_start: if self.snap_on_start:
# pylint: disable=protected-access # pylint: disable=protected-access
_copy_file(self.source._path_clean, self._path_clean) _copy_file(self.source._path_clean, self._path_clean)
if self.is_dirty(): # implies self.save_on_stop if self.snap_on_start or self.save_on_stop:
return self
if self.save_on_stop or self.snap_on_start:
_copy_file(self._path_clean, self._path_dirty) _copy_file(self._path_clean, self._path_dirty)
else: else:
_create_sparse_file(self._path_dirty, self.size) _create_sparse_file(self._path_dirty, self.size)