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

storage/reflink: remove redundant format specifiers

Browse Source
This commit is contained in:
Rusty Bird 2018-09-09 20:01:11 +00:00
parent a371375f1d
commit 850778b52a
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/storage/reflink.py
View File

@ -132,7 +132,7 @@ class ReflinkVolume(qubes.storage.Volume):
if img is None or os.path.exists(img): if img is None or os.path.exists(img):
return True return True
raise qubes.storage.StoragePoolException( raise qubes.storage.StoragePoolException(
'Missing image file {!r} for volume {!s}'.format(img, self.vid)) 'Missing image file {!r} for volume {}'.format(img, self.vid))
def remove(self): def remove(self):
''' Drop volume object from pool; remove volume images from ''' Drop volume object from pool; remove volume images from
@ -214,12 +214,12 @@ class ReflinkVolume(qubes.storage.Volume):
''' '''
if not self.rw: if not self.rw:
raise qubes.storage.StoragePoolException( raise qubes.storage.StoragePoolException(
'Cannot resize: {!s} is read-only'.format(self.vid)) 'Cannot resize: {} is read-only'.format(self.vid))
if size < self.size: if size < self.size:
raise qubes.storage.StoragePoolException( raise qubes.storage.StoragePoolException(
'For your own safety, shrinking of {!s} is disabled' 'For your own safety, shrinking of {} is disabled'
' ({:d} < {:d}). If you really know what you are doing,' ' ({} < {}). If you really know what you are doing,'
' use "truncate" manually.'.format(self.vid, size, self.size)) ' use "truncate" manually.'.format(self.vid, size, self.size))
try: # assume volume is not (cleanly) stopped ... try: # assume volume is not (cleanly) stopped ...
@ -240,7 +240,7 @@ class ReflinkVolume(qubes.storage.Volume):
def _require_save_on_stop(self, method_name): def _require_save_on_stop(self, method_name):
if not self.save_on_stop: if not self.save_on_stop:
raise NotImplementedError( raise NotImplementedError(
'Cannot {!s}: {!s} is not save_on_stop'.format( 'Cannot {}: {} is not save_on_stop'.format(
method_name, self.vid)) method_name, self.vid))
def export(self): def export(self):
@ -408,7 +408,7 @@ def _cmd(*args):
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE).stdout stderr=subprocess.PIPE).stdout
except subprocess.CalledProcessError as ex: except subprocess.CalledProcessError as ex:
msg = '{!s} err={!r} out={!r}'.format(ex, ex.stderr, ex.stdout) msg = '{} err={!r} out={!r}'.format(ex, ex.stderr, ex.stdout)
raise qubes.storage.StoragePoolException(msg) from ex raise qubes.storage.StoragePoolException(msg) from ex
def is_reflink_supported(dst_dir, src_dir=None): def is_reflink_supported(dst_dir, src_dir=None):