Fix Pool and Volume __init__

This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-04-22 14:58:21 +02:00
parent 591134833b
commit 8f060a8746

View File

@ -58,13 +58,8 @@ class Volume(object):
script = None script = None
usage = 0 usage = 0
def __init__(self, def __init__(self, name, pool, volume_type, vid=None, size=0, **kwargs):
name=None, super(Volume, self).__init__(**kwargs)
pool=None,
volume_type=None,
vid=None,
size=0):
assert name and pool and volume_type
self.name = str(name) self.name = str(name)
self.pool = str(pool) self.pool = str(pool)
self.vid = vid self.vid = vid
@ -232,9 +227,8 @@ class Pool(object):
private_img_size = qubes.config.defaults['private_img_size'] private_img_size = qubes.config.defaults['private_img_size']
root_img_size = qubes.config.defaults['root_img_size'] root_img_size = qubes.config.defaults['root_img_size']
def __init__(self, name=None, **kwargs): def __init__(self, name, **kwargs):
# :pylint: disable=unused-argument super(Pool, self).__init__(**kwargs)
assert name, "Pool name is missing"
self.name = name self.name = name
kwargs['name'] = self.name kwargs['name'] = self.name