Now that the boottool app is properly named, that is, has a .py suffix.
Signed-off-by: Cleber Rosa <[email protected]>
---
client/shared/boottool.py | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/client/shared/boottool.py b/client/shared/boottool.py
index 90f936b..ef69c59 100644
--- a/client/shared/boottool.py
+++ b/client/shared/boottool.py
@@ -13,23 +13,9 @@ Copyright 2012 Red Hat, Inc.
Released under the GPL v2
'''
-import os, sys, imp
+import os, sys
from autotest.client.shared import error
-#
-# This performs some import magic, to import the boottool cli as a module
-try:
- import autotest.common as common
- CURRENT_DIRECTORY = os.path.dirname(common.__file__)
- BOOTTOOL_CLI_PATH = os.path.join(CURRENT_DIRECTORY, "client", "tools",
"boottool.py")
-except ImportError:
- import common
- CURRENT_DIRECTORY = os.path.dirname(sys.modules[__name__].__file__)
- CLIENT_DIRECTORY = os.path.abspath(os.path.join(CURRENT_DIRECTORY, ".."))
- BOOTTOOL_CLI_PATH = os.path.join(CLIENT_DIRECTORY, "tools", "boottool.py")
-
-
-imp.load_source("boottool_cli", BOOTTOOL_CLI_PATH)
-from boottool_cli import Grubby, install_grubby_if_necessary, EfiToolSys
+from autotest.client.tools.boottool import Grubby,
install_grubby_if_necessary, EfiToolSys
class boottool(Grubby):
--
1.7.10.4
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
