[master] Hopefully simple fix

[Vratislav Podzimek]

Fix for a bug that was rejected as beta blocker, but may be accepted as final
blocker. If it does, I will cherry-pick it.

There is one more way to prevent the traceback from the back, but I think this
is the right place and right one.

Vratislav Podzimek (1):
  Filter out also protected disks in doKickstartStorage (#959677)

pyanaconda/kickstart.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[PATCH] Filter out also protected disks in doKickstartStorage (#959677)

[Vratislav Podzimek]

If there are only hidden or protected disks, nothing should be done in the
doKickstartStorage function.

Signed-off-by: Vratislav Podzimek 
---
 pyanaconda/kickstart.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 7ebcf04..df143fb 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1636,7 +1636,8 @@ def runTracebackScripts(scripts):
 def doKickstartStorage(storage, ksdata, instClass):
     """ Setup storage state from the kickstart data """
     ksdata.clearpart.execute(storage, ksdata, instClass)
-    if not [d for d in storage.disks if not d.format.hidden]:
+    if not any(d for d in storage.disks
+               if not d.format.hidden and not d.protected):
         return
     ksdata.bootloader.execute(storage, ksdata, instClass)
     ksdata.autopart.execute(storage, ksdata, instClass)

[PATCH] Filter out also protected disks in doKickstartStorage (#959677)

[Chris Lumens]

> diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
> index 7ebcf04..df143fb 100644
> --- a/pyanaconda/kickstart.py
> +++ b/pyanaconda/kickstart.py
> @@ -1636,7 +1636,8 @@ def runTracebackScripts(scripts):
>  def doKickstartStorage(storage, ksdata, instClass):
>      """ Setup storage state from the kickstart data """
>      ksdata.clearpart.execute(storage, ksdata, instClass)
> if not [d for d in storage.disks if not d.format.hidden]:
> if not any(d for d in storage.disks
>           if not d.format.hidden and not d.protected):
>    return
> ksdata.bootloader.execute(storage, ksdata, instClass)
>    ksdata.autopart.execute(storage, ksdata, instClass)

Looks good.

- Chris

[PATCH] Filter out also protected disks in doKickstartStorage (#959677)

[Vratislav Podzimek]

On Tue, 2013-05-28 at 10:46 -0400, Chris Lumens wrote:
> > diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
> > index 7ebcf04..df143fb 100644
> > --- a/pyanaconda/kickstart.py
> > +++ b/pyanaconda/kickstart.py
> > @@ -1636,7 +1636,8 @@ def runTracebackScripts(scripts):
> >  def doKickstartStorage(storage, ksdata, instClass):
> >      """ Setup storage state from the kickstart data """
> >      ksdata.clearpart.execute(storage, ksdata, instClass)
> > if not [d for d in storage.disks if not d.format.hidden]:
> > if not any(d for d in storage.disks
> >           if not d.format.hidden and not d.protected):
> >    return
> > ksdata.bootloader.execute(storage, ksdata, instClass)
> >    ksdata.autopart.execute(storage, ksdata, instClass)
>
> Looks good.

Thanks, pushed to both master and f19-branch.

[Vratislav Podzimek]

On Mon, 2013-05-27 at 12:33 +0200, Vratislav Podzimek wrote:
> Fix for a bug that was rejected as beta blocker, but may be accepted as final
> blocker. If it does, I will cherry-pick it.

As per https://bugzilla.redhat.com/show_bug.cgi?id=959677#c36 this can
be pushed to f19-branch even if it is not accepted as a final blocker.