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

qvm-block show if old revisions are available

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-07-12 18:22:54 +02:00
parent e07c4cc8e8
commit 9acd46bddb
No known key found for this signature in database
GPG Key ID: 96ED3C3BA19C3DEE
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/tools/qvm_block.py
View File

@ -50,13 +50,14 @@ def prepare_table(vd_list, full=False):
for volume in vd_list: for volume in vd_list:
if volume.domains: if volume.domains:
vmname, volume_name = volume.domains.pop() vmname, volume_name = volume.domains.pop()
output += [(str(volume), vmname, volume_name)] output += [(str(volume), vmname, volume_name, volume.revisions)]
for tupple in volume.domains: for tupple in volume.domains:
vmname, volume_name = tupple vmname, volume_name = tupple
if full or not sys.stdout.isatty(): if full or not sys.stdout.isatty():
output += [(str(volume), vmname, volume_name)] output += [(str(volume), vmname, volume_name,
volume.revisions)]
else: else:
output += [('', vmname, volume_name)] output += [('', vmname, volume_name, '', volume.revisions)]
else: else:
output += [(str(volume), "")] output += [(str(volume), "")]
@ -72,6 +73,10 @@ class VolumeData(object):
self.name = volume.name self.name = volume.name
self.pool = volume.pool self.pool = volume.pool
self.vid = volume.vid self.vid = volume.vid
if volume.revisions != {}:
self.revisions = 'Yes'
else:
self.revisions = 'No'
self.domains = [] self.domains = []
def __str__(self): def __str__(self):
@ -110,7 +115,7 @@ def list_volumes(args):
for volume in domain.attached_volumes: for volume in domain.attached_volumes:
try: try:
volume_data = vd_dict[volume.pool][volume.vid] volume_data = vd_dict[volume.pool][volume.vid]
volume_data.domains += [domain.name] volume_data.domains += [(domain.name, volume.name)]
except KeyError: except KeyError:
# Skipping volume # Skipping volume
continue continue