[rhel6-branch 8/30] Remove dependency on pykickstart by defining a few constants in blivet.

mulkieran installerbot-noreply at redhat.com
Thu May 28 21:04:13 UTC 2015


From: Anne Mulhern <amulhern at redhat.com>

These appear to be all the dependencies.

Signed-off-by: Anne Mulhern <amulhern at redhat.com>
---
 blivet/__init__.py | 2 +-
 blivet/autopart.py | 2 +-
 python-blivet.spec | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index c685eef..28b319c 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -56,7 +56,7 @@ def cb(self, exn):
 
 import parted
 
-from pykickstart.constants import AUTOPART_TYPE_LVM, CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_LIST, CLEARPART_TYPE_NONE
+from .pykickstart_constants import AUTOPART_TYPE_LVM, CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_LIST, CLEARPART_TYPE_NONE
 
 from .storage_log import log_exception_info, log_method_call
 from .errors import StorageError
diff --git a/blivet/autopart.py b/blivet/autopart.py
index 149c156..316bba0 100644
--- a/blivet/autopart.py
+++ b/blivet/autopart.py
@@ -32,7 +32,7 @@
 from .partitioning import doPartitioning, getFreeRegions, growLVM
 from .i18n import _
 
-from pykickstart.constants import AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP, AUTOPART_TYPE_PLAIN
+from .pykickstart_constants import AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP, AUTOPART_TYPE_PLAIN
 
 import logging
 log = logging.getLogger("anaconda")
diff --git a/python-blivet.spec b/python-blivet.spec
index 12ae4aa..3687132 100644
--- a/python-blivet.spec
+++ b/python-blivet.spec
@@ -12,7 +12,6 @@ Source0: http://github.com/dwlehman/blivet/archive/%{realname}-%{version}.tar.gz
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 %define dmver 1.02.17-6
-%define pykickstartver 1.99.22
 %define partedver 1.8.1
 %define pypartedver 2.5-2
 %define pythonpyblockver 0.45
@@ -27,7 +26,6 @@ BuildRequires: python-setuptools
 
 Requires: python
 Requires: python-six
-Requires: pykickstart >= %{pykickstartver}
 Requires: util-linux >= %{utillinuxver}
 Requires: python-pyudev
 Requires: parted >= %{partedver}


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/7f6ffd41321842c1880362812e94e972655760b1


More information about the anaconda-patches mailing list