[rhel6-branch V02] Fix traceback occurring in ppc bootloader code. (#1007724)

[Samantha N. Bueno]

There was still an error in the original, so....here we go again. This
actually *does* fix the traceback.
====

This was caused by a couple errors from 6732cc71.
Resolves: rhbz#1007724
Related: rhbz#877852
---
 booty/ppc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/booty/ppc.py b/booty/ppc.py
index 096de39..2cb2103 100644
--- a/booty/ppc.py
+++ b/booty/ppc.py
@@ -5,11 +5,12 @@ from booty import BootyNoKernelWarning
 from util import getDiskPart
 from bootloaderInfo import *
 import iutil
+import parted

class ppcBootloaderInfo(bootloaderInfo):
     def pickPReP(self):
         # if we created a new PReP partition, pick that
-        for a in self.storage.findActions(type="create", obj="format"):
+        for a in self.storage.devicetree.findActions(type="create", object="format"):
             if a.format.type == "prepboot" and a.device in self.storage.devices:
                 return a.device

@@ -38,7 +39,6 @@ class ppcBootloaderInfo(bootloaderInfo):
         return prepdevs[0]

def getBootDevs(self, bl):
-        import parted

retval = []
         machine = iutil.getPPCMachine()

[Vratislav Podzimek]

On Fri, 2013-09-13 at 09:26 -0400, Samantha N. Bueno wrote:
> There was still an error in the original, so....here we go again. This
> actually *does* fix the traceback.
> ====
>
> This was caused by a couple errors from 6732cc71.
> Resolves: rhbz#1007724
> Related: rhbz#877852
>
> booty/ppc.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/booty/ppc.py b/booty/ppc.py
> index 096de39..2cb2103 100644
> --- a/booty/ppc.py
> +++ b/booty/ppc.py
> @@ -5,11 +5,12 @@ from booty import BootyNoKernelWarning
>  from util import getDiskPart
>  from bootloaderInfo import *
>  import iutil
> +import parted
>
> class ppcBootloaderInfo(bootloaderInfo):
>      def pickPReP(self):
>          # if we created a new PReP partition, pick that
>    for a in self.storage.findActions(type="create", obj="format"):
>    for a in self.storage.devicetree.findActions(type="create", object="format"):
>        if a.format.type == "prepboot" and a.device in self.storage.devices:
>            return a.device
>
> @@ -38,7 +39,6 @@ class ppcBootloaderInfo(bootloaderInfo):
>          return prepdevs[0]
>  def getBootDevs(self, bl):
>    import parted
>
>    retval = []
>    machine = iutil.getPPCMachine()

ACK.