On Wed, 2015-02-11 at 16:48 +0100, Vratislav Podzimek wrote:
We need to update our import paths.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com
pyanaconda/kickstart.py | 2 +- pyanaconda/ui/gui/spokes/custom.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 5a31299..8a33b2c 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -303,7 +303,7 @@ class AutoPart(commands.autopart.F21_AutoPart): return retval
def execute(self, storage, ksdata, instClass):
from blivet.partitioning import doAutoPartition
from blivet.autopart import doAutoPartition from pyanaconda.storage_utils import sanity_check if not self.autopart:
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index c051055..193a379 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -46,7 +46,6 @@ from blivet.formats import device_formats from blivet.formats import getFormat from blivet.formats.fs import FS from blivet.size import Size -from blivet import Root from blivet.devicefactory import DEVICE_TYPE_LVM from blivet.devicefactory import DEVICE_TYPE_BTRFS from blivet.devicefactory import DEVICE_TYPE_PARTITION @@ -54,8 +53,8 @@ from blivet.devicefactory import DEVICE_TYPE_MD from blivet.devicefactory import DEVICE_TYPE_DISK from blivet.devicefactory import DEVICE_TYPE_LVM_THINP from blivet.devicefactory import SIZE_POLICY_AUTO -from blivet import findExistingInstallations -from blivet.partitioning import doAutoPartition +from blivet.osinstall import findExistingInstallations, Root +from blivet.autopart import doAutoPartition from blivet.errors import StorageError from blivet.errors import NoDisksError from blivet.errors import NotEnoughFreeSpaceError
Turns out I accidentally pushed the patch that moved the autopart code into anaconda some time ago. I'm reverting it right now and sending a new version of this patch because it needs some more changes then.