[master 11/11] modules: dont treat booty special.

[Ales Kozumplik <akozumpl@xxxxxxxxxx>]

It really is just another pyanaconda subpackage.
---
 booty/alpha.py          |    2 +-
 booty/bootloaderInfo.py |    4 ++--
 booty/ia64.py           |    2 +-
 booty/ppc.py            |    2 +-
 booty/sparc.py          |    2 +-
 booty/x86.py            |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/booty/alpha.py b/booty/alpha.py
index 549455f..18021cb 100644
--- a/booty/alpha.py
+++ b/booty/alpha.py
@@ -1,7 +1,7 @@
 import os
 import pyanaconda.iutil as iutil
 
-from booty import BootyNoKernelWarning
+from pyanaconda.booty import BootyNoKernelWarning
 from bootloaderInfo import *
 from util import getDiskPart
 
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index d455bf7..dcd5820 100644
--- a/booty/bootloaderInfo.py
+++ b/booty/bootloaderInfo.py
@@ -35,7 +35,7 @@ import pyanaconda.iutil as iutil
 import pyanaconda.isys as isys
 from pyanaconda.product import *
 
-import booty
+import pyanaconda.booty
 import checkbootloader
 from util import getDiskPart
 
@@ -473,7 +473,7 @@ class bootloaderInfo(object):
                                               defaultDev)
             rc = config.write(instRoot + self.configfile, perms = self.perms)
         else:
-            raise booty.BootyNoKernelWarning
+            raise pyanaconda.booty.BootyNoKernelWarning
 
         return rc
 
diff --git a/booty/ia64.py b/booty/ia64.py
index f0f0146..796ed5c 100644
--- a/booty/ia64.py
+++ b/booty/ia64.py
@@ -1,4 +1,4 @@
-from booty import BootyNoKernelWarning
+from pyanaconda.booty import BootyNoKernelWarning
 from bootloaderInfo import *
 
 class ia64BootloaderInfo(efiBootloaderInfo):
diff --git a/booty/ppc.py b/booty/ppc.py
index 53bb9e4..6a5c5b9 100644
--- a/booty/ppc.py
+++ b/booty/ppc.py
@@ -1,7 +1,7 @@
 import string
 import os
 
-from booty import BootyNoKernelWarning
+from pyanaconda.booty import BootyNoKernelWarning
 from bootloaderInfo import *
 import pyanaconda.iutil as iutil
 
diff --git a/booty/sparc.py b/booty/sparc.py
index da06e2a..aeb9e94 100644
--- a/booty/sparc.py
+++ b/booty/sparc.py
@@ -1,7 +1,7 @@
 import string
 import os
 
-from booty import BootyNoKernelWarning
+from pyanaconda.booty import BootyNoKernelWarning
 from util import getDiskPart
 from bootloaderInfo import *
 import pyanaconda.iutil as iutil
diff --git a/booty/x86.py b/booty/x86.py
index e80cabf..ae88aa4 100644
--- a/booty/x86.py
+++ b/booty/x86.py
@@ -1,7 +1,7 @@
 import os
 import string
 
-from booty import BootyNoKernelWarning
+from pyanaconda.booty import BootyNoKernelWarning
 from util import getDiskPart
 from bootloaderInfo import *
 from pyanaconda.flags import flags
-- 
1.7.0.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list