[3.0-devel 1/1] Quickfix of merge bugs
by dashea
From: Jan Pokorny <japokorn(a)redhat.com>
- fixed bugs from manual merging
---
blivet/blivet.py | 1 -
blivet/devicetree.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/blivet/blivet.py b/blivet/blivet.py
index 8faea58..978014a 100644
--- a/blivet/blivet.py
+++ b/blivet/blivet.py
@@ -69,7 +69,6 @@ def __init__(self, ksdata=None):
self.clear_part_choice = None
self.encrypted_autopart = False
self.encryption_passphrase = None
- self.autopart_type = AUTOPART_TYPE_LVM
self.encryption_cipher = None
self.escrow_certificates = {}
self.autopart_escrow_cert = None
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index dd6fd92..4f603ea 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -904,7 +904,7 @@ def __init__(self, passphrase=None, luks_dict=None, ignored_disks=None, exclusiv
self.luks_dict_passed = luks_dict
DeviceTreeBase.__init__(self, ignored_disks=ignored_disks, exclusive_disks=exclusive_disks)
- PopulatorMixin.__init__(self, passphrase=passphrase, luks_dict=luks_dict_passed, disk_images=disk_images)
+ PopulatorMixin.__init__(self, passphrase=passphrase, luks_dict=self.luks_dict_passed, disk_images=disk_images)
EventHandlerMixin.__init__(self)
# pylint: disable=arguments-differ
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/673a1cf0a629cfba73302a532add...
7 years, 11 months