Signed-off-by: mulhern amulhern@redhat.com --- blivet/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py index ca61ae8..ff4f7fd 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -122,11 +122,12 @@ def enable_installer_mode(): from pyanaconda.errors import ERROR_RAISE # pylint: disable=redefined-outer-name
if hasattr(iutil, 'getTargetPhysicalRoot'): - # Introduced in newer Anaconda - _storageRoot = iutil.getTargetPhysicalRoot() + # For anaconda versions > 21.43 + _storageRoot = iutil.getTargetPhysicalRoot() # pylint: disable=no-name-in-module _sysroot = iutil.getSysroot() else: - from pyanaconda.constants import ROOT_PATH # pylint: disable=redefined-outer-name + # For prior anaconda versions + from pyanaconda.constants import ROOT_PATH # pylint: disable=redefined-outer-name,no-name-in-module _storageRoot = _sysroot = ROOT_PATH
from pyanaconda.anaconda_log import program_log_lock
On Tue, 2014-07-01 at 12:39 -0400, mulhern wrote:
Signed-off-by: mulhern amulhern@redhat.com
blivet/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py index ca61ae8..ff4f7fd 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -122,11 +122,12 @@ def enable_installer_mode(): from pyanaconda.errors import ERROR_RAISE # pylint: disable=redefined-outer-name
if hasattr(iutil, 'getTargetPhysicalRoot'):
# Introduced in newer Anaconda
_storageRoot = iutil.getTargetPhysicalRoot()
# For anaconda versions > 21.43
else:_storageRoot = iutil.getTargetPhysicalRoot() # pylint: disable=no-name-in-module _sysroot = iutil.getSysroot()
from pyanaconda.constants import ROOT_PATH # pylint: disable=redefined-outer-name
# For prior anaconda versions
from pyanaconda.constants import ROOT_PATH # pylint: disable=redefined-outer-name,no-name-in-module _storageRoot = _sysroot = ROOT_PATH
from pyanaconda.anaconda_log import program_log_lock
Looks good to me.
anaconda-patches@lists.fedorahosted.org