Choo choo here comes the crud train
From: David Shea dshea@redhat.com
These need to be before any import from gi.repository to keep pygobject from complaining. --- blivet/devicefactory.py | 3 +++ blivet/devicelibs/lvm.py | 4 ++++ blivet/devices/btrfs.py | 4 ++++ blivet/devices/disk.py | 6 +++++- blivet/devices/dm.py | 6 +++++- blivet/devices/loop.py | 6 +++++- blivet/devices/lvm.py | 4 ++++ blivet/devices/md.py | 3 +++ blivet/devices/partition.py | 4 ++++ blivet/devicetree.py | 3 +++ blivet/formats/__init__.py | 6 +++++- blivet/formats/luks.py | 6 +++++- blivet/formats/lvmpv.py | 6 +++++- blivet/formats/mdraid.py | 3 +++ blivet/formats/swap.py | 4 ++++ blivet/osinstall.py | 4 ++++ blivet/partitioning.py | 6 +++++- blivet/populator.py | 3 +++ blivet/tasks/availability.py | 3 +++ blivet/util.py | 6 +++++- blivet/zfcp.py | 4 ++++ tests/devices_test/device_properties_test.py | 4 ++++ 22 files changed, 90 insertions(+), 8 deletions(-)
diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py index 0d9e5a1..634eab2 100644 --- a/blivet/devicefactory.py +++ b/blivet/devicefactory.py @@ -35,6 +35,9 @@ from .partitioning import doPartitioning from .size import Size
+import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
import logging diff --git a/blivet/devicelibs/lvm.py b/blivet/devicelibs/lvm.py index ec4ca1e..0872f11 100644 --- a/blivet/devicelibs/lvm.py +++ b/blivet/devicelibs/lvm.py @@ -23,6 +23,10 @@ import re
from collections import namedtuple + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
import logging diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py index 56f0f37..d336f91 100644 --- a/blivet/devices/btrfs.py +++ b/blivet/devices/btrfs.py @@ -22,6 +22,10 @@ import os import copy import tempfile + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from ..devicelibs import btrfs diff --git a/blivet/devices/disk.py b/blivet/devices/disk.py index 7b3bfdd..6221a22 100644 --- a/blivet/devices/disk.py +++ b/blivet/devices/disk.py @@ -20,9 +20,13 @@ # Red Hat Author(s): David Lehman dlehman@redhat.com #
-import os +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
+import os + from .. import errors from .. import util from ..flags import flags diff --git a/blivet/devices/dm.py b/blivet/devices/dm.py index 10eca77..04cc390 100644 --- a/blivet/devices/dm.py +++ b/blivet/devices/dm.py @@ -20,9 +20,13 @@ # Red Hat Author(s): David Lehman dlehman@redhat.com #
-import os +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
+import os + from .. import errors from .. import util from ..storage_log import log_method_call diff --git a/blivet/devices/loop.py b/blivet/devices/loop.py index 301fdf4..27c56b0 100644 --- a/blivet/devices/loop.py +++ b/blivet/devices/loop.py @@ -19,9 +19,13 @@ # Red Hat Author(s): David Lehman dlehman@redhat.com #
-import os +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
+import os + from .. import errors from ..storage_log import log_method_call from ..tasks import availability diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py index 2e0aa80..b47b849 100644 --- a/blivet/devices/lvm.py +++ b/blivet/devices/lvm.py @@ -26,6 +26,10 @@ import pprint import re import os + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
# device backend modules diff --git a/blivet/devices/md.py b/blivet/devices/md.py index 4cb700b..e4156f8 100644 --- a/blivet/devices/md.py +++ b/blivet/devices/md.py @@ -22,6 +22,9 @@ import os import six
+import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from ..devicelibs import mdraid, raid diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py index cd81363..b7f81e9 100644 --- a/blivet/devices/partition.py +++ b/blivet/devices/partition.py @@ -22,6 +22,10 @@ import os import parted import _ped + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from .. import errors diff --git a/blivet/devicetree.py b/blivet/devicetree.py index ecfaa14..274fc0d 100644 --- a/blivet/devicetree.py +++ b/blivet/devicetree.py @@ -23,6 +23,9 @@ import os import re
+import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from .actionlist import ActionList diff --git a/blivet/formats/__init__.py b/blivet/formats/__init__.py index 4da131b..4751d88 100644 --- a/blivet/formats/__init__.py +++ b/blivet/formats/__init__.py @@ -21,9 +21,13 @@ # Red Hat Author(s): Dave Lehman dlehman@redhat.com #
+import gi +gi.require_version("BlockDev", "1.0") + +from gi.repository import BlockDev as blockdev + import os import importlib -from gi.repository import BlockDev as blockdev
from ..util import notify_kernel from ..util import get_sysfs_path_by_name diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py index f729e1e..35a4ff0 100644 --- a/blivet/formats/luks.py +++ b/blivet/formats/luks.py @@ -20,9 +20,13 @@ # Red Hat Author(s): Dave Lehman dlehman@redhat.com #
-import os +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
+import os + from ..storage_log import log_method_call from ..errors import LUKSError from ..devicelibs import crypto diff --git a/blivet/formats/lvmpv.py b/blivet/formats/lvmpv.py index c1655d6..c19221c 100644 --- a/blivet/formats/lvmpv.py +++ b/blivet/formats/lvmpv.py @@ -20,9 +20,13 @@ # Red Hat Author(s): Dave Lehman dlehman@redhat.com #
-import os +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
+import os + from ..storage_log import log_method_call from parted import PARTITION_LVM from ..devicelibs import lvm diff --git a/blivet/formats/mdraid.py b/blivet/formats/mdraid.py index 5d8b22b..ea5da1f 100644 --- a/blivet/formats/mdraid.py +++ b/blivet/formats/mdraid.py @@ -20,6 +20,9 @@ # Red Hat Author(s): Dave Lehman dlehman@redhat.com #
+import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from ..storage_log import log_method_call diff --git a/blivet/formats/swap.py b/blivet/formats/swap.py index a93a70f..4b243b0 100644 --- a/blivet/formats/swap.py +++ b/blivet/formats/swap.py @@ -25,6 +25,10 @@ from ..tasks import availability from . import DeviceFormat, register_device_format from ..size import Size + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
import logging diff --git a/blivet/osinstall.py b/blivet/osinstall.py index 3b8a163..5918904 100644 --- a/blivet/osinstall.py +++ b/blivet/osinstall.py @@ -24,6 +24,10 @@ import os import stat import time + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from . import util diff --git a/blivet/partitioning.py b/blivet/partitioning.py index bc5617d..0e85eac 100644 --- a/blivet/partitioning.py +++ b/blivet/partitioning.py @@ -22,9 +22,13 @@
from operator import gt, lt from decimal import Decimal -from gi.repository import BlockDev as blockdev import functools
+import gi +gi.require_version("BlockDev", "1.0") + +from gi.repository import BlockDev as blockdev + import parted
from .errors import DeviceError, PartitioningError diff --git a/blivet/populator.py b/blivet/populator.py index e576b2b..f5d86bf 100644 --- a/blivet/populator.py +++ b/blivet/populator.py @@ -27,6 +27,9 @@ import copy import parted
+import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from .errors import CorruptGPTError, DeviceError, DeviceTreeError, DiskLabelScanError, DuplicateVGError, FSError, InvalidDiskLabelError, LUKSError diff --git a/blivet/tasks/availability.py b/blivet/tasks/availability.py index efb8b75..9682fc6 100644 --- a/blivet/tasks/availability.py +++ b/blivet/tasks/availability.py @@ -25,6 +25,9 @@
from six import add_metaclass
+import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from .. import util diff --git a/blivet/util.py b/blivet/util.py index 4a6a4d6..302861e 100644 --- a/blivet/util.py +++ b/blivet/util.py @@ -14,9 +14,13 @@ import warnings from decimal import Decimal from contextlib import contextmanager -from gi.repository import BlockDev as blockdev from functools import wraps
+import gi +gi.require_version("BlockDev", "1.0") + +from gi.repository import BlockDev as blockdev + import six
import logging diff --git a/blivet/zfcp.py b/blivet/zfcp.py index b1a1317..4410a9d 100644 --- a/blivet/zfcp.py +++ b/blivet/zfcp.py @@ -25,6 +25,10 @@ from .util import open # pylint: disable=redefined-builtin from .i18n import _ from .util import stringize, unicodeize + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
import logging diff --git a/tests/devices_test/device_properties_test.py b/tests/devices_test/device_properties_test.py index 21d2b80..aad60a1 100644 --- a/tests/devices_test/device_properties_test.py +++ b/tests/devices_test/device_properties_test.py @@ -1,6 +1,10 @@ # vim:set fileencoding=utf-8
import unittest + +import gi +gi.require_version("BlockDev", "1.0") + from gi.repository import BlockDev as blockdev
from mock import Mock
Added label: ACK.
All aboard!
Closed.
chugga chugga chugga chugga wooooo wooooo
anaconda-patches@lists.fedorahosted.org
-
dashea