Blame SOURCES/0001-Move-blivet-module-package-to-blivet3.patch

aada13
From a43bcd7f839b4cfc2a134612ff850012b22534fd Mon Sep 17 00:00:00 2001
aada13
From: David Lehman <dlehman@redhat.com>
aada13
Date: Mon, 25 Mar 2019 14:27:45 -0400
aada13
Subject: [PATCH 1/8] Move blivet module/package to blivet3.
aada13
aada13
---
aada13
 {blivet => blivet3}/__init__.py               |   2 +-
aada13
 {blivet => blivet3}/actionlist.py             |   0
aada13
 {blivet => blivet3}/arch.py                   |   0
aada13
 {blivet => blivet3}/blivet.py                 |   0
aada13
 {blivet => blivet3}/callbacks.py              |   0
aada13
 {blivet => blivet3}/dbus/__init__.py          |   0
aada13
 {blivet => blivet3}/dbus/action.py            |   0
aada13
 {blivet => blivet3}/dbus/blivet.py            |   0
aada13
 {blivet => blivet3}/dbus/constants.py         |   0
aada13
 {blivet => blivet3}/dbus/device.py            |   0
aada13
 {blivet => blivet3}/dbus/format.py            |   0
aada13
 {blivet => blivet3}/dbus/manager.py           |   0
aada13
 {blivet => blivet3}/dbus/object.py            |   0
aada13
 {blivet => blivet3}/deviceaction.py           |   0
aada13
 {blivet => blivet3}/devicefactory.py          |   2 +-
aada13
 {blivet => blivet3}/devicelibs/__init__.py    |   0
aada13
 {blivet => blivet3}/devicelibs/btrfs.py       |   0
aada13
 {blivet => blivet3}/devicelibs/crypto.py      |   0
aada13
 {blivet => blivet3}/devicelibs/disk.py        |   0
aada13
 {blivet => blivet3}/devicelibs/edd.py         |   0
aada13
 {blivet => blivet3}/devicelibs/lvm.py         |   0
aada13
 {blivet => blivet3}/devicelibs/mdraid.py      |   0
aada13
 {blivet => blivet3}/devicelibs/raid.py        |   0
aada13
 {blivet => blivet3}/devices/__init__.py       |   0
aada13
 {blivet => blivet3}/devices/btrfs.py          |   0
aada13
 {blivet => blivet3}/devices/cache.py          |   0
aada13
 {blivet => blivet3}/devices/container.py      |   0
aada13
 {blivet => blivet3}/devices/device.py         |   0
aada13
 {blivet => blivet3}/devices/disk.py           |   0
aada13
 {blivet => blivet3}/devices/dm.py             |   0
aada13
 {blivet => blivet3}/devices/file.py           |   0
aada13
 {blivet => blivet3}/devices/lib.py            |   0
aada13
 {blivet => blivet3}/devices/loop.py           |   0
aada13
 {blivet => blivet3}/devices/luks.py           |   0
aada13
 {blivet => blivet3}/devices/lvm.py            |   0
aada13
 {blivet => blivet3}/devices/md.py             |   0
aada13
 {blivet => blivet3}/devices/network.py        |   0
aada13
 {blivet => blivet3}/devices/nfs.py            |   0
aada13
 {blivet => blivet3}/devices/nodev.py          |   0
aada13
 {blivet => blivet3}/devices/optical.py        |   0
aada13
 {blivet => blivet3}/devices/partition.py      |   0
aada13
 {blivet => blivet3}/devices/raid.py           |   0
aada13
 {blivet => blivet3}/devices/storage.py        |   0
aada13
 {blivet => blivet3}/devicetree.py             |   0
aada13
 {blivet => blivet3}/errors.py                 |   0
aada13
 {blivet => blivet3}/events/__init__.py        |   0
aada13
 {blivet => blivet3}/events/changes.py         |   0
aada13
 {blivet => blivet3}/events/handler.py         |   0
aada13
 {blivet => blivet3}/events/manager.py         |   0
aada13
 {blivet => blivet3}/fcoe.py                   |   0
aada13
 {blivet => blivet3}/flags.py                  |   0
aada13
 {blivet => blivet3}/formats/__init__.py       |   0
aada13
 {blivet => blivet3}/formats/biosboot.py       |   0
aada13
 {blivet => blivet3}/formats/disklabel.py      |   0
aada13
 {blivet => blivet3}/formats/dmraid.py         |   0
aada13
 {blivet => blivet3}/formats/fs.py             |   0
aada13
 {blivet => blivet3}/formats/fslib.py          |   0
aada13
 {blivet => blivet3}/formats/luks.py           |   0
aada13
 {blivet => blivet3}/formats/lvmpv.py          |   0
aada13
 {blivet => blivet3}/formats/mdraid.py         |   0
aada13
 {blivet => blivet3}/formats/multipath.py      |   0
aada13
 {blivet => blivet3}/formats/prepboot.py       |   0
aada13
 {blivet => blivet3}/formats/swap.py           |   0
aada13
 {blivet => blivet3}/i18n.py                   |   0
aada13
 {blivet => blivet3}/iscsi.py                  |   0
aada13
 {blivet => blivet3}/mounts.py                 |   0
aada13
 {blivet => blivet3}/partitioning.py           |   0
aada13
 {blivet => blivet3}/populator/__init__.py     |   0
aada13
 .../populator/helpers/__init__.py             |   0
aada13
 {blivet => blivet3}/populator/helpers/boot.py |   0
aada13
 .../populator/helpers/btrfs.py                |   0
aada13
 .../populator/helpers/devicepopulator.py      |   0
aada13
 {blivet => blivet3}/populator/helpers/disk.py |   0
aada13
 .../populator/helpers/disklabel.py            |   0
aada13
 {blivet => blivet3}/populator/helpers/dm.py   |   0
aada13
 .../populator/helpers/dmraid.py               |   0
aada13
 .../populator/helpers/formatpopulator.py      |   0
aada13
 {blivet => blivet3}/populator/helpers/loop.py |   0
aada13
 {blivet => blivet3}/populator/helpers/luks.py |   0
aada13
 {blivet => blivet3}/populator/helpers/lvm.py  |   0
aada13
 .../populator/helpers/mdraid.py               |   0
aada13
 .../populator/helpers/multipath.py            |   0
aada13
 .../populator/helpers/optical.py              |   0
aada13
 .../populator/helpers/partition.py            |   0
aada13
 .../populator/helpers/populatorhelper.py      |   0
aada13
 {blivet => blivet3}/populator/populator.py    |   0
aada13
 {blivet => blivet3}/safe_dbus.py              |   0
aada13
 {blivet => blivet3}/size.py                   |   0
aada13
 {blivet => blivet3}/static_data/__init__.py   |   0
aada13
 {blivet => blivet3}/static_data/luks_data.py  |   0
aada13
 {blivet => blivet3}/static_data/lvm_info.py   |   0
aada13
 {blivet => blivet3}/static_data/mpath_info.py |   0
aada13
 {blivet => blivet3}/static_data/nvdimm.py     |   0
aada13
 {blivet => blivet3}/storage_log.py            |   0
aada13
 {blivet => blivet3}/tasks/__init__.py         |   0
aada13
 {blivet => blivet3}/tasks/availability.py     |   0
aada13
 {blivet => blivet3}/tasks/dfresize.py         |   0
aada13
 {blivet => blivet3}/tasks/fsck.py             |   0
aada13
 {blivet => blivet3}/tasks/fsinfo.py           |   0
aada13
 {blivet => blivet3}/tasks/fslabeling.py       |   0
aada13
 {blivet => blivet3}/tasks/fsminsize.py        |   0
aada13
 {blivet => blivet3}/tasks/fsmkfs.py           |   0
aada13
 {blivet => blivet3}/tasks/fsmount.py          |   0
aada13
 {blivet => blivet3}/tasks/fsreadlabel.py      |   0
aada13
 {blivet => blivet3}/tasks/fsresize.py         |   0
aada13
 {blivet => blivet3}/tasks/fssize.py           |   0
aada13
 {blivet => blivet3}/tasks/fssync.py           |   0
aada13
 {blivet => blivet3}/tasks/fstask.py           |   0
aada13
 {blivet => blivet3}/tasks/fsuuid.py           |   0
aada13
 {blivet => blivet3}/tasks/fswritelabel.py     |   0
aada13
 {blivet => blivet3}/tasks/fswriteuuid.py      |   0
aada13
 {blivet => blivet3}/tasks/lukstasks.py        |   0
aada13
 {blivet => blivet3}/tasks/pvtask.py           |   0
aada13
 {blivet => blivet3}/tasks/task.py             |   0
aada13
 {blivet => blivet3}/threads.py                |   0
aada13
 {blivet => blivet3}/tsort.py                  |   0
aada13
 {blivet => blivet3}/udev.py                   |   0
aada13
 {blivet => blivet3}/util.py                   |   0
aada13
 {blivet => blivet3}/zfcp.py                   |   0
aada13
 dbus/blivetd                                  |   4 +-
aada13
 doc/intro.rst                                 |  10 +-
aada13
 examples/factory.py                           |   6 +-
aada13
 examples/list_devices.py                      |   4 +-
aada13
 examples/lvm.py                               |   6 +-
aada13
 examples/lvm_cache.py                         |   8 +-
aada13
 examples/lvm_non_linear.py                    |   6 +-
aada13
 examples/partitioning.py                      |   6 +-
aada13
 examples/uevents.py                           |   8 +-
aada13
 tests/action_test.py                          |  38 +-
aada13
 tests/dbus_test.py                            |  34 +-
aada13
 tests/devicefactory_test.py                   |  30 +-
aada13
 tests/devicelibs_test/disk_test.py            |  14 +-
aada13
 tests/devicelibs_test/edd_test.py             |   4 +-
aada13
 tests/devicelibs_test/mdraid_test.py          |   2 +-
aada13
 tests/devicelibs_test/raid_test.py            |   6 +-
aada13
 tests/devices_test/dependencies_test.py       |  34 +-
aada13
 tests/devices_test/device_methods_test.py     |  44 +--
aada13
 tests/devices_test/device_names_test.py       |  10 +-
aada13
 tests/devices_test/device_packages_test.py    |   8 +-
aada13
 tests/devices_test/device_properties_test.py  |  44 +--
aada13
 tests/devices_test/disk_test.py               |  10 +-
aada13
 tests/devices_test/lvm_test.py                |  26 +-
aada13
 tests/devices_test/md_test.py                 |  10 +-
aada13
 tests/devices_test/network_test.py            |   6 +-
aada13
 tests/devices_test/partition_test.py          |  24 +-
aada13
 tests/devices_test/size_test.py               |   8 +-
aada13
 tests/devices_test/tags_test.py               |   8 +-
aada13
 tests/devicetree_test.py                      |  26 +-
aada13
 tests/events_test.py                          |   4 +-
aada13
 tests/formats_test/device_test.py             |   2 +-
aada13
 tests/formats_test/disklabel_test.py          |  14 +-
aada13
 tests/formats_test/fs_test.py                 |   4 +-
aada13
 tests/formats_test/fslabeling.py              |   4 +-
aada13
 tests/formats_test/fstesting.py               |   6 +-
aada13
 tests/formats_test/fsuuid.py                  |   6 +-
aada13
 tests/formats_test/init_test.py               |   2 +-
aada13
 tests/formats_test/labeling_test.py           |   6 +-
aada13
 tests/formats_test/luks_test.py               |   6 +-
aada13
 tests/formats_test/methods_test.py            |  32 +-
aada13
 tests/formats_test/misc_test.py               |   4 +-
aada13
 tests/formats_test/selinux_test.py            |   6 +-
aada13
 tests/formats_test/uuid_test.py               |   4 +-
aada13
 tests/imagebackedtestcase.py                  |   6 +-
aada13
 tests/integration/incomplete-lvm.sh           |   4 +
aada13
 tests/loopbackedtestcase.py                   |   2 +-
aada13
 tests/parentlist_test.py                      |   4 +-
aada13
 tests/partitioning_test.py                    |  50 +--
aada13
 tests/populator_test.py                       | 350 +++++++++---------
aada13
 tests/size_test.py                            |   6 +-
aada13
 tests/storagetestcase.py                      |   8 +-
aada13
 tests/tasks_test/basic_tests.py               |   4 +-
aada13
 tests/tsort_test.py                           |   2 +-
aada13
 tests/udev_test.py                            |  10 +-
aada13
 tests/unsupported_disklabel_test.py           |  32 +-
aada13
 tests/util_test.py                            |   6 +-
aada13
 tests/vmtests/blivet_reset_vmtest.py          |  10 +-
aada13
 tests/vmtests/vmbackedtestcase.py             |   2 +-
aada13
 177 files changed, 524 insertions(+), 520 deletions(-)
aada13
 rename {blivet => blivet3}/__init__.py (98%)
aada13
 rename {blivet => blivet3}/actionlist.py (100%)
aada13
 rename {blivet => blivet3}/arch.py (100%)
aada13
 rename {blivet => blivet3}/blivet.py (100%)
aada13
 rename {blivet => blivet3}/callbacks.py (100%)
aada13
 rename {blivet => blivet3}/dbus/__init__.py (100%)
aada13
 rename {blivet => blivet3}/dbus/action.py (100%)
aada13
 rename {blivet => blivet3}/dbus/blivet.py (100%)
aada13
 rename {blivet => blivet3}/dbus/constants.py (100%)
aada13
 rename {blivet => blivet3}/dbus/device.py (100%)
aada13
 rename {blivet => blivet3}/dbus/format.py (100%)
aada13
 rename {blivet => blivet3}/dbus/manager.py (100%)
aada13
 rename {blivet => blivet3}/dbus/object.py (100%)
aada13
 rename {blivet => blivet3}/deviceaction.py (100%)
aada13
 rename {blivet => blivet3}/devicefactory.py (99%)
aada13
 rename {blivet => blivet3}/devicelibs/__init__.py (100%)
aada13
 rename {blivet => blivet3}/devicelibs/btrfs.py (100%)
aada13
 rename {blivet => blivet3}/devicelibs/crypto.py (100%)
aada13
 rename {blivet => blivet3}/devicelibs/disk.py (100%)
aada13
 rename {blivet => blivet3}/devicelibs/edd.py (100%)
aada13
 rename {blivet => blivet3}/devicelibs/lvm.py (100%)
aada13
 rename {blivet => blivet3}/devicelibs/mdraid.py (100%)
aada13
 rename {blivet => blivet3}/devicelibs/raid.py (100%)
aada13
 rename {blivet => blivet3}/devices/__init__.py (100%)
aada13
 rename {blivet => blivet3}/devices/btrfs.py (100%)
aada13
 rename {blivet => blivet3}/devices/cache.py (100%)
aada13
 rename {blivet => blivet3}/devices/container.py (100%)
aada13
 rename {blivet => blivet3}/devices/device.py (100%)
aada13
 rename {blivet => blivet3}/devices/disk.py (100%)
aada13
 rename {blivet => blivet3}/devices/dm.py (100%)
aada13
 rename {blivet => blivet3}/devices/file.py (100%)
aada13
 rename {blivet => blivet3}/devices/lib.py (100%)
aada13
 rename {blivet => blivet3}/devices/loop.py (100%)
aada13
 rename {blivet => blivet3}/devices/luks.py (100%)
aada13
 rename {blivet => blivet3}/devices/lvm.py (100%)
aada13
 rename {blivet => blivet3}/devices/md.py (100%)
aada13
 rename {blivet => blivet3}/devices/network.py (100%)
aada13
 rename {blivet => blivet3}/devices/nfs.py (100%)
aada13
 rename {blivet => blivet3}/devices/nodev.py (100%)
aada13
 rename {blivet => blivet3}/devices/optical.py (100%)
aada13
 rename {blivet => blivet3}/devices/partition.py (100%)
aada13
 rename {blivet => blivet3}/devices/raid.py (100%)
aada13
 rename {blivet => blivet3}/devices/storage.py (100%)
aada13
 rename {blivet => blivet3}/devicetree.py (100%)
aada13
 rename {blivet => blivet3}/errors.py (100%)
aada13
 rename {blivet => blivet3}/events/__init__.py (100%)
aada13
 rename {blivet => blivet3}/events/changes.py (100%)
aada13
 rename {blivet => blivet3}/events/handler.py (100%)
aada13
 rename {blivet => blivet3}/events/manager.py (100%)
aada13
 rename {blivet => blivet3}/fcoe.py (100%)
aada13
 rename {blivet => blivet3}/flags.py (100%)
aada13
 rename {blivet => blivet3}/formats/__init__.py (100%)
aada13
 rename {blivet => blivet3}/formats/biosboot.py (100%)
aada13
 rename {blivet => blivet3}/formats/disklabel.py (100%)
aada13
 rename {blivet => blivet3}/formats/dmraid.py (100%)
aada13
 rename {blivet => blivet3}/formats/fs.py (100%)
aada13
 rename {blivet => blivet3}/formats/fslib.py (100%)
aada13
 rename {blivet => blivet3}/formats/luks.py (100%)
aada13
 rename {blivet => blivet3}/formats/lvmpv.py (100%)
aada13
 rename {blivet => blivet3}/formats/mdraid.py (100%)
aada13
 rename {blivet => blivet3}/formats/multipath.py (100%)
aada13
 rename {blivet => blivet3}/formats/prepboot.py (100%)
aada13
 rename {blivet => blivet3}/formats/swap.py (100%)
aada13
 rename {blivet => blivet3}/i18n.py (100%)
aada13
 rename {blivet => blivet3}/iscsi.py (100%)
aada13
 rename {blivet => blivet3}/mounts.py (100%)
aada13
 rename {blivet => blivet3}/partitioning.py (100%)
aada13
 rename {blivet => blivet3}/populator/__init__.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/__init__.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/boot.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/btrfs.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/devicepopulator.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/disk.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/disklabel.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/dm.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/dmraid.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/formatpopulator.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/loop.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/luks.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/lvm.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/mdraid.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/multipath.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/optical.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/partition.py (100%)
aada13
 rename {blivet => blivet3}/populator/helpers/populatorhelper.py (100%)
aada13
 rename {blivet => blivet3}/populator/populator.py (100%)
aada13
 rename {blivet => blivet3}/safe_dbus.py (100%)
aada13
 rename {blivet => blivet3}/size.py (100%)
aada13
 rename {blivet => blivet3}/static_data/__init__.py (100%)
aada13
 rename {blivet => blivet3}/static_data/luks_data.py (100%)
aada13
 rename {blivet => blivet3}/static_data/lvm_info.py (100%)
aada13
 rename {blivet => blivet3}/static_data/mpath_info.py (100%)
aada13
 rename {blivet => blivet3}/static_data/nvdimm.py (100%)
aada13
 rename {blivet => blivet3}/storage_log.py (100%)
aada13
 rename {blivet => blivet3}/tasks/__init__.py (100%)
aada13
 rename {blivet => blivet3}/tasks/availability.py (100%)
aada13
 rename {blivet => blivet3}/tasks/dfresize.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsck.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsinfo.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fslabeling.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsminsize.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsmkfs.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsmount.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsreadlabel.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsresize.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fssize.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fssync.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fstask.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fsuuid.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fswritelabel.py (100%)
aada13
 rename {blivet => blivet3}/tasks/fswriteuuid.py (100%)
aada13
 rename {blivet => blivet3}/tasks/lukstasks.py (100%)
aada13
 rename {blivet => blivet3}/tasks/pvtask.py (100%)
aada13
 rename {blivet => blivet3}/tasks/task.py (100%)
aada13
 rename {blivet => blivet3}/threads.py (100%)
aada13
 rename {blivet => blivet3}/tsort.py (100%)
aada13
 rename {blivet => blivet3}/udev.py (100%)
aada13
 rename {blivet => blivet3}/util.py (100%)
aada13
 rename {blivet => blivet3}/zfcp.py (100%)
aada13
 create mode 100644 tests/integration/incomplete-lvm.sh
aada13
aada13
diff --git a/blivet/__init__.py b/blivet3/__init__.py
aada13
similarity index 98%
aada13
rename from blivet/__init__.py
aada13
rename to blivet3/__init__.py
aada13
index 74744e38..902d3df9 100644
aada13
--- a/blivet/__init__.py
aada13
+++ b/blivet3/__init__.py
aada13
@@ -124,7 +124,7 @@ class _LazyImportObject(object):
aada13
         return dir(val)
aada13
 
aada13
 
aada13
-# this way things like 'from blivet import Blivet' work without an overhead of
aada13
+# this way things like 'from blivet3 import Blivet' work without an overhead of
aada13
 # importing of everything the Blivet class needs whenever anything from the
aada13
 # 'blivet' package is imported (e.g. the 'arch' module)
aada13
 Blivet = _LazyImportObject("Blivet", "blivet")
aada13
diff --git a/blivet/actionlist.py b/blivet3/actionlist.py
aada13
similarity index 100%
aada13
rename from blivet/actionlist.py
aada13
rename to blivet3/actionlist.py
aada13
diff --git a/blivet/arch.py b/blivet3/arch.py
aada13
similarity index 100%
aada13
rename from blivet/arch.py
aada13
rename to blivet3/arch.py
aada13
diff --git a/blivet/blivet.py b/blivet3/blivet.py
aada13
similarity index 100%
aada13
rename from blivet/blivet.py
aada13
rename to blivet3/blivet.py
aada13
diff --git a/blivet/callbacks.py b/blivet3/callbacks.py
aada13
similarity index 100%
aada13
rename from blivet/callbacks.py
aada13
rename to blivet3/callbacks.py
aada13
diff --git a/blivet/dbus/__init__.py b/blivet3/dbus/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/__init__.py
aada13
rename to blivet3/dbus/__init__.py
aada13
diff --git a/blivet/dbus/action.py b/blivet3/dbus/action.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/action.py
aada13
rename to blivet3/dbus/action.py
aada13
diff --git a/blivet/dbus/blivet.py b/blivet3/dbus/blivet.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/blivet.py
aada13
rename to blivet3/dbus/blivet.py
aada13
diff --git a/blivet/dbus/constants.py b/blivet3/dbus/constants.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/constants.py
aada13
rename to blivet3/dbus/constants.py
aada13
diff --git a/blivet/dbus/device.py b/blivet3/dbus/device.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/device.py
aada13
rename to blivet3/dbus/device.py
aada13
diff --git a/blivet/dbus/format.py b/blivet3/dbus/format.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/format.py
aada13
rename to blivet3/dbus/format.py
aada13
diff --git a/blivet/dbus/manager.py b/blivet3/dbus/manager.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/manager.py
aada13
rename to blivet3/dbus/manager.py
aada13
diff --git a/blivet/dbus/object.py b/blivet3/dbus/object.py
aada13
similarity index 100%
aada13
rename from blivet/dbus/object.py
aada13
rename to blivet3/dbus/object.py
aada13
diff --git a/blivet/deviceaction.py b/blivet3/deviceaction.py
aada13
similarity index 100%
aada13
rename from blivet/deviceaction.py
aada13
rename to blivet3/deviceaction.py
aada13
diff --git a/blivet/devicefactory.py b/blivet3/devicefactory.py
aada13
similarity index 99%
aada13
rename from blivet/devicefactory.py
aada13
rename to blivet3/devicefactory.py
aada13
index 51595416..a15b60c9 100644
aada13
--- a/blivet/devicefactory.py
aada13
+++ b/blivet3/devicefactory.py
aada13
@@ -182,7 +182,7 @@ class DeviceFactory(object):
aada13
         group exists on disk its size will not be changed, but if it has not
aada13
         been written to disk it will be adjusted to hold the new logical volume::
aada13
 
aada13
-            import blivet
aada13
+            import blivet3
aada13
 
aada13
             _blivet = blivet.Blivet()
aada13
             _blivet.reset()
aada13
diff --git a/blivet/devicelibs/__init__.py b/blivet3/devicelibs/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/__init__.py
aada13
rename to blivet3/devicelibs/__init__.py
aada13
diff --git a/blivet/devicelibs/btrfs.py b/blivet3/devicelibs/btrfs.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/btrfs.py
aada13
rename to blivet3/devicelibs/btrfs.py
aada13
diff --git a/blivet/devicelibs/crypto.py b/blivet3/devicelibs/crypto.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/crypto.py
aada13
rename to blivet3/devicelibs/crypto.py
aada13
diff --git a/blivet/devicelibs/disk.py b/blivet3/devicelibs/disk.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/disk.py
aada13
rename to blivet3/devicelibs/disk.py
aada13
diff --git a/blivet/devicelibs/edd.py b/blivet3/devicelibs/edd.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/edd.py
aada13
rename to blivet3/devicelibs/edd.py
aada13
diff --git a/blivet/devicelibs/lvm.py b/blivet3/devicelibs/lvm.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/lvm.py
aada13
rename to blivet3/devicelibs/lvm.py
aada13
diff --git a/blivet/devicelibs/mdraid.py b/blivet3/devicelibs/mdraid.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/mdraid.py
aada13
rename to blivet3/devicelibs/mdraid.py
aada13
diff --git a/blivet/devicelibs/raid.py b/blivet3/devicelibs/raid.py
aada13
similarity index 100%
aada13
rename from blivet/devicelibs/raid.py
aada13
rename to blivet3/devicelibs/raid.py
aada13
diff --git a/blivet/devices/__init__.py b/blivet3/devices/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/devices/__init__.py
aada13
rename to blivet3/devices/__init__.py
aada13
diff --git a/blivet/devices/btrfs.py b/blivet3/devices/btrfs.py
aada13
similarity index 100%
aada13
rename from blivet/devices/btrfs.py
aada13
rename to blivet3/devices/btrfs.py
aada13
diff --git a/blivet/devices/cache.py b/blivet3/devices/cache.py
aada13
similarity index 100%
aada13
rename from blivet/devices/cache.py
aada13
rename to blivet3/devices/cache.py
aada13
diff --git a/blivet/devices/container.py b/blivet3/devices/container.py
aada13
similarity index 100%
aada13
rename from blivet/devices/container.py
aada13
rename to blivet3/devices/container.py
aada13
diff --git a/blivet/devices/device.py b/blivet3/devices/device.py
aada13
similarity index 100%
aada13
rename from blivet/devices/device.py
aada13
rename to blivet3/devices/device.py
aada13
diff --git a/blivet/devices/disk.py b/blivet3/devices/disk.py
aada13
similarity index 100%
aada13
rename from blivet/devices/disk.py
aada13
rename to blivet3/devices/disk.py
aada13
diff --git a/blivet/devices/dm.py b/blivet3/devices/dm.py
aada13
similarity index 100%
aada13
rename from blivet/devices/dm.py
aada13
rename to blivet3/devices/dm.py
aada13
diff --git a/blivet/devices/file.py b/blivet3/devices/file.py
aada13
similarity index 100%
aada13
rename from blivet/devices/file.py
aada13
rename to blivet3/devices/file.py
aada13
diff --git a/blivet/devices/lib.py b/blivet3/devices/lib.py
aada13
similarity index 100%
aada13
rename from blivet/devices/lib.py
aada13
rename to blivet3/devices/lib.py
aada13
diff --git a/blivet/devices/loop.py b/blivet3/devices/loop.py
aada13
similarity index 100%
aada13
rename from blivet/devices/loop.py
aada13
rename to blivet3/devices/loop.py
aada13
diff --git a/blivet/devices/luks.py b/blivet3/devices/luks.py
aada13
similarity index 100%
aada13
rename from blivet/devices/luks.py
aada13
rename to blivet3/devices/luks.py
aada13
diff --git a/blivet/devices/lvm.py b/blivet3/devices/lvm.py
aada13
similarity index 100%
aada13
rename from blivet/devices/lvm.py
aada13
rename to blivet3/devices/lvm.py
aada13
diff --git a/blivet/devices/md.py b/blivet3/devices/md.py
aada13
similarity index 100%
aada13
rename from blivet/devices/md.py
aada13
rename to blivet3/devices/md.py
aada13
diff --git a/blivet/devices/network.py b/blivet3/devices/network.py
aada13
similarity index 100%
aada13
rename from blivet/devices/network.py
aada13
rename to blivet3/devices/network.py
aada13
diff --git a/blivet/devices/nfs.py b/blivet3/devices/nfs.py
aada13
similarity index 100%
aada13
rename from blivet/devices/nfs.py
aada13
rename to blivet3/devices/nfs.py
aada13
diff --git a/blivet/devices/nodev.py b/blivet3/devices/nodev.py
aada13
similarity index 100%
aada13
rename from blivet/devices/nodev.py
aada13
rename to blivet3/devices/nodev.py
aada13
diff --git a/blivet/devices/optical.py b/blivet3/devices/optical.py
aada13
similarity index 100%
aada13
rename from blivet/devices/optical.py
aada13
rename to blivet3/devices/optical.py
aada13
diff --git a/blivet/devices/partition.py b/blivet3/devices/partition.py
aada13
similarity index 100%
aada13
rename from blivet/devices/partition.py
aada13
rename to blivet3/devices/partition.py
aada13
diff --git a/blivet/devices/raid.py b/blivet3/devices/raid.py
aada13
similarity index 100%
aada13
rename from blivet/devices/raid.py
aada13
rename to blivet3/devices/raid.py
aada13
diff --git a/blivet/devices/storage.py b/blivet3/devices/storage.py
aada13
similarity index 100%
aada13
rename from blivet/devices/storage.py
aada13
rename to blivet3/devices/storage.py
aada13
diff --git a/blivet/devicetree.py b/blivet3/devicetree.py
aada13
similarity index 100%
aada13
rename from blivet/devicetree.py
aada13
rename to blivet3/devicetree.py
aada13
diff --git a/blivet/errors.py b/blivet3/errors.py
aada13
similarity index 100%
aada13
rename from blivet/errors.py
aada13
rename to blivet3/errors.py
aada13
diff --git a/blivet/events/__init__.py b/blivet3/events/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/events/__init__.py
aada13
rename to blivet3/events/__init__.py
aada13
diff --git a/blivet/events/changes.py b/blivet3/events/changes.py
aada13
similarity index 100%
aada13
rename from blivet/events/changes.py
aada13
rename to blivet3/events/changes.py
aada13
diff --git a/blivet/events/handler.py b/blivet3/events/handler.py
aada13
similarity index 100%
aada13
rename from blivet/events/handler.py
aada13
rename to blivet3/events/handler.py
aada13
diff --git a/blivet/events/manager.py b/blivet3/events/manager.py
aada13
similarity index 100%
aada13
rename from blivet/events/manager.py
aada13
rename to blivet3/events/manager.py
aada13
diff --git a/blivet/fcoe.py b/blivet3/fcoe.py
aada13
similarity index 100%
aada13
rename from blivet/fcoe.py
aada13
rename to blivet3/fcoe.py
aada13
diff --git a/blivet/flags.py b/blivet3/flags.py
aada13
similarity index 100%
aada13
rename from blivet/flags.py
aada13
rename to blivet3/flags.py
aada13
diff --git a/blivet/formats/__init__.py b/blivet3/formats/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/formats/__init__.py
aada13
rename to blivet3/formats/__init__.py
aada13
diff --git a/blivet/formats/biosboot.py b/blivet3/formats/biosboot.py
aada13
similarity index 100%
aada13
rename from blivet/formats/biosboot.py
aada13
rename to blivet3/formats/biosboot.py
aada13
diff --git a/blivet/formats/disklabel.py b/blivet3/formats/disklabel.py
aada13
similarity index 100%
aada13
rename from blivet/formats/disklabel.py
aada13
rename to blivet3/formats/disklabel.py
aada13
diff --git a/blivet/formats/dmraid.py b/blivet3/formats/dmraid.py
aada13
similarity index 100%
aada13
rename from blivet/formats/dmraid.py
aada13
rename to blivet3/formats/dmraid.py
aada13
diff --git a/blivet/formats/fs.py b/blivet3/formats/fs.py
aada13
similarity index 100%
aada13
rename from blivet/formats/fs.py
aada13
rename to blivet3/formats/fs.py
aada13
diff --git a/blivet/formats/fslib.py b/blivet3/formats/fslib.py
aada13
similarity index 100%
aada13
rename from blivet/formats/fslib.py
aada13
rename to blivet3/formats/fslib.py
aada13
diff --git a/blivet/formats/luks.py b/blivet3/formats/luks.py
aada13
similarity index 100%
aada13
rename from blivet/formats/luks.py
aada13
rename to blivet3/formats/luks.py
aada13
diff --git a/blivet/formats/lvmpv.py b/blivet3/formats/lvmpv.py
aada13
similarity index 100%
aada13
rename from blivet/formats/lvmpv.py
aada13
rename to blivet3/formats/lvmpv.py
aada13
diff --git a/blivet/formats/mdraid.py b/blivet3/formats/mdraid.py
aada13
similarity index 100%
aada13
rename from blivet/formats/mdraid.py
aada13
rename to blivet3/formats/mdraid.py
aada13
diff --git a/blivet/formats/multipath.py b/blivet3/formats/multipath.py
aada13
similarity index 100%
aada13
rename from blivet/formats/multipath.py
aada13
rename to blivet3/formats/multipath.py
aada13
diff --git a/blivet/formats/prepboot.py b/blivet3/formats/prepboot.py
aada13
similarity index 100%
aada13
rename from blivet/formats/prepboot.py
aada13
rename to blivet3/formats/prepboot.py
aada13
diff --git a/blivet/formats/swap.py b/blivet3/formats/swap.py
aada13
similarity index 100%
aada13
rename from blivet/formats/swap.py
aada13
rename to blivet3/formats/swap.py
aada13
diff --git a/blivet/i18n.py b/blivet3/i18n.py
aada13
similarity index 100%
aada13
rename from blivet/i18n.py
aada13
rename to blivet3/i18n.py
aada13
diff --git a/blivet/iscsi.py b/blivet3/iscsi.py
aada13
similarity index 100%
aada13
rename from blivet/iscsi.py
aada13
rename to blivet3/iscsi.py
aada13
diff --git a/blivet/mounts.py b/blivet3/mounts.py
aada13
similarity index 100%
aada13
rename from blivet/mounts.py
aada13
rename to blivet3/mounts.py
aada13
diff --git a/blivet/partitioning.py b/blivet3/partitioning.py
aada13
similarity index 100%
aada13
rename from blivet/partitioning.py
aada13
rename to blivet3/partitioning.py
aada13
diff --git a/blivet/populator/__init__.py b/blivet3/populator/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/populator/__init__.py
aada13
rename to blivet3/populator/__init__.py
aada13
diff --git a/blivet/populator/helpers/__init__.py b/blivet3/populator/helpers/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/__init__.py
aada13
rename to blivet3/populator/helpers/__init__.py
aada13
diff --git a/blivet/populator/helpers/boot.py b/blivet3/populator/helpers/boot.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/boot.py
aada13
rename to blivet3/populator/helpers/boot.py
aada13
diff --git a/blivet/populator/helpers/btrfs.py b/blivet3/populator/helpers/btrfs.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/btrfs.py
aada13
rename to blivet3/populator/helpers/btrfs.py
aada13
diff --git a/blivet/populator/helpers/devicepopulator.py b/blivet3/populator/helpers/devicepopulator.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/devicepopulator.py
aada13
rename to blivet3/populator/helpers/devicepopulator.py
aada13
diff --git a/blivet/populator/helpers/disk.py b/blivet3/populator/helpers/disk.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/disk.py
aada13
rename to blivet3/populator/helpers/disk.py
aada13
diff --git a/blivet/populator/helpers/disklabel.py b/blivet3/populator/helpers/disklabel.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/disklabel.py
aada13
rename to blivet3/populator/helpers/disklabel.py
aada13
diff --git a/blivet/populator/helpers/dm.py b/blivet3/populator/helpers/dm.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/dm.py
aada13
rename to blivet3/populator/helpers/dm.py
aada13
diff --git a/blivet/populator/helpers/dmraid.py b/blivet3/populator/helpers/dmraid.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/dmraid.py
aada13
rename to blivet3/populator/helpers/dmraid.py
aada13
diff --git a/blivet/populator/helpers/formatpopulator.py b/blivet3/populator/helpers/formatpopulator.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/formatpopulator.py
aada13
rename to blivet3/populator/helpers/formatpopulator.py
aada13
diff --git a/blivet/populator/helpers/loop.py b/blivet3/populator/helpers/loop.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/loop.py
aada13
rename to blivet3/populator/helpers/loop.py
aada13
diff --git a/blivet/populator/helpers/luks.py b/blivet3/populator/helpers/luks.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/luks.py
aada13
rename to blivet3/populator/helpers/luks.py
aada13
diff --git a/blivet/populator/helpers/lvm.py b/blivet3/populator/helpers/lvm.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/lvm.py
aada13
rename to blivet3/populator/helpers/lvm.py
aada13
diff --git a/blivet/populator/helpers/mdraid.py b/blivet3/populator/helpers/mdraid.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/mdraid.py
aada13
rename to blivet3/populator/helpers/mdraid.py
aada13
diff --git a/blivet/populator/helpers/multipath.py b/blivet3/populator/helpers/multipath.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/multipath.py
aada13
rename to blivet3/populator/helpers/multipath.py
aada13
diff --git a/blivet/populator/helpers/optical.py b/blivet3/populator/helpers/optical.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/optical.py
aada13
rename to blivet3/populator/helpers/optical.py
aada13
diff --git a/blivet/populator/helpers/partition.py b/blivet3/populator/helpers/partition.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/partition.py
aada13
rename to blivet3/populator/helpers/partition.py
aada13
diff --git a/blivet/populator/helpers/populatorhelper.py b/blivet3/populator/helpers/populatorhelper.py
aada13
similarity index 100%
aada13
rename from blivet/populator/helpers/populatorhelper.py
aada13
rename to blivet3/populator/helpers/populatorhelper.py
aada13
diff --git a/blivet/populator/populator.py b/blivet3/populator/populator.py
aada13
similarity index 100%
aada13
rename from blivet/populator/populator.py
aada13
rename to blivet3/populator/populator.py
aada13
diff --git a/blivet/safe_dbus.py b/blivet3/safe_dbus.py
aada13
similarity index 100%
aada13
rename from blivet/safe_dbus.py
aada13
rename to blivet3/safe_dbus.py
aada13
diff --git a/blivet/size.py b/blivet3/size.py
aada13
similarity index 100%
aada13
rename from blivet/size.py
aada13
rename to blivet3/size.py
aada13
diff --git a/blivet/static_data/__init__.py b/blivet3/static_data/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/static_data/__init__.py
aada13
rename to blivet3/static_data/__init__.py
aada13
diff --git a/blivet/static_data/luks_data.py b/blivet3/static_data/luks_data.py
aada13
similarity index 100%
aada13
rename from blivet/static_data/luks_data.py
aada13
rename to blivet3/static_data/luks_data.py
aada13
diff --git a/blivet/static_data/lvm_info.py b/blivet3/static_data/lvm_info.py
aada13
similarity index 100%
aada13
rename from blivet/static_data/lvm_info.py
aada13
rename to blivet3/static_data/lvm_info.py
aada13
diff --git a/blivet/static_data/mpath_info.py b/blivet3/static_data/mpath_info.py
aada13
similarity index 100%
aada13
rename from blivet/static_data/mpath_info.py
aada13
rename to blivet3/static_data/mpath_info.py
aada13
diff --git a/blivet/static_data/nvdimm.py b/blivet3/static_data/nvdimm.py
aada13
similarity index 100%
aada13
rename from blivet/static_data/nvdimm.py
aada13
rename to blivet3/static_data/nvdimm.py
aada13
diff --git a/blivet/storage_log.py b/blivet3/storage_log.py
aada13
similarity index 100%
aada13
rename from blivet/storage_log.py
aada13
rename to blivet3/storage_log.py
aada13
diff --git a/blivet/tasks/__init__.py b/blivet3/tasks/__init__.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/__init__.py
aada13
rename to blivet3/tasks/__init__.py
aada13
diff --git a/blivet/tasks/availability.py b/blivet3/tasks/availability.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/availability.py
aada13
rename to blivet3/tasks/availability.py
aada13
diff --git a/blivet/tasks/dfresize.py b/blivet3/tasks/dfresize.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/dfresize.py
aada13
rename to blivet3/tasks/dfresize.py
aada13
diff --git a/blivet/tasks/fsck.py b/blivet3/tasks/fsck.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsck.py
aada13
rename to blivet3/tasks/fsck.py
aada13
diff --git a/blivet/tasks/fsinfo.py b/blivet3/tasks/fsinfo.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsinfo.py
aada13
rename to blivet3/tasks/fsinfo.py
aada13
diff --git a/blivet/tasks/fslabeling.py b/blivet3/tasks/fslabeling.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fslabeling.py
aada13
rename to blivet3/tasks/fslabeling.py
aada13
diff --git a/blivet/tasks/fsminsize.py b/blivet3/tasks/fsminsize.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsminsize.py
aada13
rename to blivet3/tasks/fsminsize.py
aada13
diff --git a/blivet/tasks/fsmkfs.py b/blivet3/tasks/fsmkfs.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsmkfs.py
aada13
rename to blivet3/tasks/fsmkfs.py
aada13
diff --git a/blivet/tasks/fsmount.py b/blivet3/tasks/fsmount.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsmount.py
aada13
rename to blivet3/tasks/fsmount.py
aada13
diff --git a/blivet/tasks/fsreadlabel.py b/blivet3/tasks/fsreadlabel.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsreadlabel.py
aada13
rename to blivet3/tasks/fsreadlabel.py
aada13
diff --git a/blivet/tasks/fsresize.py b/blivet3/tasks/fsresize.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsresize.py
aada13
rename to blivet3/tasks/fsresize.py
aada13
diff --git a/blivet/tasks/fssize.py b/blivet3/tasks/fssize.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fssize.py
aada13
rename to blivet3/tasks/fssize.py
aada13
diff --git a/blivet/tasks/fssync.py b/blivet3/tasks/fssync.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fssync.py
aada13
rename to blivet3/tasks/fssync.py
aada13
diff --git a/blivet/tasks/fstask.py b/blivet3/tasks/fstask.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fstask.py
aada13
rename to blivet3/tasks/fstask.py
aada13
diff --git a/blivet/tasks/fsuuid.py b/blivet3/tasks/fsuuid.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fsuuid.py
aada13
rename to blivet3/tasks/fsuuid.py
aada13
diff --git a/blivet/tasks/fswritelabel.py b/blivet3/tasks/fswritelabel.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fswritelabel.py
aada13
rename to blivet3/tasks/fswritelabel.py
aada13
diff --git a/blivet/tasks/fswriteuuid.py b/blivet3/tasks/fswriteuuid.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/fswriteuuid.py
aada13
rename to blivet3/tasks/fswriteuuid.py
aada13
diff --git a/blivet/tasks/lukstasks.py b/blivet3/tasks/lukstasks.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/lukstasks.py
aada13
rename to blivet3/tasks/lukstasks.py
aada13
diff --git a/blivet/tasks/pvtask.py b/blivet3/tasks/pvtask.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/pvtask.py
aada13
rename to blivet3/tasks/pvtask.py
aada13
diff --git a/blivet/tasks/task.py b/blivet3/tasks/task.py
aada13
similarity index 100%
aada13
rename from blivet/tasks/task.py
aada13
rename to blivet3/tasks/task.py
aada13
diff --git a/blivet/threads.py b/blivet3/threads.py
aada13
similarity index 100%
aada13
rename from blivet/threads.py
aada13
rename to blivet3/threads.py
aada13
diff --git a/blivet/tsort.py b/blivet3/tsort.py
aada13
similarity index 100%
aada13
rename from blivet/tsort.py
aada13
rename to blivet3/tsort.py
aada13
diff --git a/blivet/udev.py b/blivet3/udev.py
aada13
similarity index 100%
aada13
rename from blivet/udev.py
aada13
rename to blivet3/udev.py
aada13
diff --git a/blivet/util.py b/blivet3/util.py
aada13
similarity index 100%
aada13
rename from blivet/util.py
aada13
rename to blivet3/util.py
aada13
diff --git a/blivet/zfcp.py b/blivet3/zfcp.py
aada13
similarity index 100%
aada13
rename from blivet/zfcp.py
aada13
rename to blivet3/zfcp.py
aada13
diff --git a/dbus/blivetd b/dbus/blivetd
aada13
index 6505a805..d9abbcd5 100755
aada13
--- a/dbus/blivetd
aada13
+++ b/dbus/blivetd
aada13
@@ -3,8 +3,8 @@ import dbus
aada13
 import dbus.mainloop.glib
aada13
 from gi.repository import GLib
aada13
 
aada13
-from blivet.dbus.blivet import DBusBlivet
aada13
-from blivet.dbus.manager import ObjectManager
aada13
+from blivet3.dbus.blivet import DBusBlivet
aada13
+from blivet3.dbus.manager import ObjectManager
aada13
 
aada13
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
aada13
 system_bus = dbus.SystemBus()
aada13
diff --git a/examples/factory.py b/examples/factory.py
aada13
index 7c477468..e54c1bea 100644
aada13
--- a/examples/factory.py
aada13
+++ b/examples/factory.py
aada13
@@ -1,8 +1,8 @@
aada13
 import os
aada13
 
aada13
-import blivet
aada13
-from blivet.size import Size
aada13
-from blivet.util import set_up_logging, create_sparse_tempfile
aada13
+import blivet3
aada13
+from blivet3.size import Size
aada13
+from blivet3.util import set_up_logging, create_sparse_tempfile
aada13
 
aada13
 set_up_logging()
aada13
 b = blivet.Blivet()   # create an instance of Blivet (don't add system devices)
aada13
diff --git a/examples/list_devices.py b/examples/list_devices.py
aada13
index 384fd5ee..2415ae85 100644
aada13
--- a/examples/list_devices.py
aada13
+++ b/examples/list_devices.py
aada13
@@ -1,5 +1,5 @@
aada13
-import blivet
aada13
-from blivet.util import set_up_logging
aada13
+import blivet3
aada13
+from blivet3.util import set_up_logging
aada13
 
aada13
 set_up_logging()
aada13
 b = blivet.Blivet()   # create an instance of Blivet
aada13
diff --git a/examples/lvm.py b/examples/lvm.py
aada13
index ac1f561c..6f736a44 100644
aada13
--- a/examples/lvm.py
aada13
+++ b/examples/lvm.py
aada13
@@ -1,8 +1,8 @@
aada13
 import os
aada13
 
aada13
-import blivet
aada13
-from blivet.size import Size
aada13
-from blivet.util import set_up_logging, create_sparse_tempfile
aada13
+import blivet3
aada13
+from blivet3.size import Size
aada13
+from blivet3.util import set_up_logging, create_sparse_tempfile
aada13
 
aada13
 set_up_logging()
aada13
 b = blivet.Blivet()   # create an instance of Blivet (don't add system devices)
aada13
diff --git a/examples/lvm_cache.py b/examples/lvm_cache.py
aada13
index e8dd0623..5f1d71ea 100644
aada13
--- a/examples/lvm_cache.py
aada13
+++ b/examples/lvm_cache.py
aada13
@@ -1,9 +1,9 @@
aada13
 import os
aada13
 
aada13
-import blivet
aada13
-from blivet.size import Size
aada13
-from blivet.util import set_up_logging, create_sparse_tempfile
aada13
-from blivet.devices.lvm import LVMCacheRequest
aada13
+import blivet3
aada13
+from blivet3.size import Size
aada13
+from blivet3.util import set_up_logging, create_sparse_tempfile
aada13
+from blivet3.devices.lvm import LVMCacheRequest
aada13
 
aada13
 set_up_logging()
aada13
 b = blivet.Blivet()   # create an instance of Blivet (don't add system devices)
aada13
diff --git a/examples/lvm_non_linear.py b/examples/lvm_non_linear.py
aada13
index 08a484ce..72aa8a09 100644
aada13
--- a/examples/lvm_non_linear.py
aada13
+++ b/examples/lvm_non_linear.py
aada13
@@ -1,8 +1,8 @@
aada13
 import os
aada13
 
aada13
-import blivet
aada13
-from blivet.size import Size
aada13
-from blivet.util import set_up_logging, create_sparse_tempfile
aada13
+import blivet3
aada13
+from blivet3.size import Size
aada13
+from blivet3.util import set_up_logging, create_sparse_tempfile
aada13
 
aada13
 set_up_logging()
aada13
 b = blivet.Blivet()   # create an instance of Blivet (don't add system devices)
aada13
diff --git a/examples/partitioning.py b/examples/partitioning.py
aada13
index ee53fa83..4174b2ea 100644
aada13
--- a/examples/partitioning.py
aada13
+++ b/examples/partitioning.py
aada13
@@ -1,8 +1,8 @@
aada13
 import os
aada13
 
aada13
-import blivet
aada13
-from blivet.size import Size
aada13
-from blivet.util import set_up_logging, create_sparse_tempfile
aada13
+import blivet3
aada13
+from blivet3.size import Size
aada13
+from blivet3.util import set_up_logging, create_sparse_tempfile
aada13
 
aada13
 set_up_logging()
aada13
 b = blivet.Blivet()   # create an instance of Blivet (don't add system devices)
aada13
diff --git a/examples/uevents.py b/examples/uevents.py
aada13
index f9f4f668..31edea8e 100644
aada13
--- a/examples/uevents.py
aada13
+++ b/examples/uevents.py
aada13
@@ -1,8 +1,8 @@
aada13
 import time
aada13
 
aada13
-import blivet
aada13
-from blivet.events.manager import event_manager
aada13
-from blivet.util import set_up_logging
aada13
+import blivet3
aada13
+from blivet3.events.manager import event_manager
aada13
+from blivet3.util import set_up_logging
aada13
 
aada13
 
aada13
 def print_changes(event, changes):
aada13
@@ -13,7 +13,7 @@ def print_changes(event, changes):
aada13
     print()
aada13
 
aada13
 
aada13
-set_up_logging(console_logs=["blivet.event"])
aada13
+set_up_logging(console_logs=["blivet3.event"])
aada13
 b = blivet.Blivet()  # create an instance of Blivet
aada13
 b.reset()  # detect system storage configuration
aada13
 print(b.devicetree)
aada13
-- 
aada13
2.17.2
aada13