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

storage/reflink: make resize()/import_volume() more readable

Browse Source
This commit is contained in:
Rusty Bird 2018-10-29 20:21:41 +00:00
parent 425d993769
commit 73db2751b8
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qubes/storage/reflink.py
View File

@ -264,13 +264,14 @@ class ReflinkVolume(qubes.storage.Volume):
try: # assume volume is not (cleanly) stopped ... try: # assume volume is not (cleanly) stopped ...
_resize_file(self._path_dirty, size) _resize_file(self._path_dirty, size)
self.size = size update = True
except FileNotFoundError: # ... but it actually is. except FileNotFoundError: # ... but it actually is.
_resize_file(self._path_clean, size) _resize_file(self._path_clean, size)
self.size = size update = False
return self
_update_loopdev_sizes(self._path_dirty) self.size = size
if update:
_update_loopdev_sizes(self._path_dirty)
return self return self
def export(self): def export(self):
@ -301,11 +302,11 @@ class ReflinkVolume(qubes.storage.Volume):
if not self.save_on_stop: if not self.save_on_stop:
return self return self
try: try:
success = False
_copy_file(src_volume.export(), self._path_import) _copy_file(src_volume.export(), self._path_import)
except: success = True
self._import_data_end(False) finally:
raise self._import_data_end(success)
self._import_data_end(True)
return self return self
def _path_revision(self, number, timestamp=None): def _path_revision(self, number, timestamp=None):