[master/rhel7] LiveImageKSPayload skip the parent class setup method (#1010500)

[Brian C. Lane]

From: "Brian C. Lane"

LiveImageKSPayload mounts the image itself, so call the ImagePayload
setup method instead.

Resolves: rhbz#1010500
---
 pyanaconda/packaging/livepayload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
index 377dc46..b9a4814 100644
--- a/pyanaconda/packaging/livepayload.py
+++ b/pyanaconda/packaging/livepayload.py
@@ -210,7 +210,8 @@ class LiveImageKSPayload(LiveImagePayload):
     def setup(self, storage):
         """ Check the availability and size of the image.
         """
-        super(LiveImageKSPayload, self).setup(storage)
+        # This is on purpose, we don't want to call LiveImagePayload's setup method.
+        ImagePayload.setup(self, storage)

self._proxies = {}
         if self.data.method.proxy:

[Vratislav Podzimek]

On Fri, 2013-09-20 at 15:10 -0700, Brian C. Lane wrote:
> From: "Brian C. Lane"
>
> LiveImageKSPayload mounts the image itself, so call the ImagePayload
> setup method instead.
> Resolves: rhbz#1010500
>
> pyanaconda/packaging/livepayload.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
> index 377dc46..b9a4814 100644
> --- a/pyanaconda/packaging/livepayload.py
> +++ b/pyanaconda/packaging/livepayload.py
> @@ -210,7 +210,8 @@ class LiveImageKSPayload(LiveImagePayload):
>      def setup(self, storage):
>          """ Check the availability and size of the image.
>          """
>    super(LiveImageKSPayload, self).setup(storage)
>    # This is on purpose, we don't want to call LiveImagePayload's setup method.
>    ImagePayload.setup(self, storage)
>
>    self._proxies = {}
>    if self.data.method.proxy:

ACK.