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

core: minor fixes in handling properties

Browse Source 
Conflicts:
	qubes/vm/qubesvm.py
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-10 17:49:22 +01:00 committed by Wojtek Porczyk
parent 12941d67bf
commit 2f3762ee68
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubes/vm/qubesvm.py
View File

@ -98,6 +98,7 @@ def _setter_name(self, prop, value):
def _setter_kernel(self, prop, value): def _setter_kernel(self, prop, value):
# pylint: disable=unused-argument # pylint: disable=unused-argument
value = str(value)
dirname = os.path.join( dirname = os.path.join(
qubes.config.system_path['qubes_base_dir'], qubes.config.system_path['qubes_base_dir'],
qubes.config.system_path['qubes_kernels_base_dir'], qubes.config.system_path['qubes_kernels_base_dir'],
@ -107,7 +108,7 @@ def _setter_kernel(self, prop, value):
'Kernel {!r} not installed'.format(value)) 'Kernel {!r} not installed'.format(value))
for filename in ('vmlinuz', 'initramfs'): for filename in ('vmlinuz', 'initramfs'):
if not os.path.exists(os.path.join(dirname, filename)): if not os.path.exists(os.path.join(dirname, filename)):
raise qubes.exc.QubesPropertyValueError( raise qubes.exc.QubesPropertyValueError(self, prop, value,
'Kernel {!r} not properly installed: missing {!r} file'.format( 'Kernel {!r} not properly installed: missing {!r} file'.format(
value, filename)) value, filename))
return value return value
@ -187,6 +188,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
# FIXME self.app.host could not exist - only self.app.vm required by API # FIXME self.app.host could not exist - only self.app.vm required by API
vcpus = qubes.property('vcpus', vcpus = qubes.property('vcpus',
type=int,
default=(lambda self: self.app.host.no_cpus), default=(lambda self: self.app.host.no_cpus),
ls_width=2, ls_width=2,
doc='FIXME') doc='FIXME')
@ -259,13 +261,15 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
backup_size = qubes.property('backup_size', type=int, default=0, backup_size = qubes.property('backup_size', type=int, default=0,
doc='FIXME') doc='FIXME')
# TODO default=None?
backup_path = qubes.property('backup_path', type=str, default='', backup_path = qubes.property('backup_path', type=str, default='',
doc='FIXME') doc='FIXME')
# format got changed from %s to str(datetime.datetime) # format got changed from %s to str(datetime.datetime)
backup_timestamp = qubes.property('backup_timestamp', default=None, backup_timestamp = qubes.property('backup_timestamp', default=None,
setter=(lambda self, prop, value: setter=(lambda self, prop, value:
datetime.datetime.fromtimestamp(value)), value if isinstance(value, datetime.datetime) else
datetime.datetime.fromtimestamp(int(value))),
saver=(lambda self, prop, value: value.strftime('%s')), saver=(lambda self, prop, value: value.strftime('%s')),
doc='FIXME') doc='FIXME')
@ -897,7 +901,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
:param str input: string passed as input to service :param str input: string passed as input to service
''' # pylint: disable=redefined-builtin ''' # pylint: disable=redefined-builtin
if len(i for i in (input, passio_popen, localcmd) if i) > 1: if len([i for i in (input, passio_popen, localcmd) if i]) > 1:
raise ValueError( raise ValueError(
'input, passio_popen and localcmd cannot be used together') 'input, passio_popen and localcmd cannot be used together')