[rhel7-branch] Fix tb due to non-existant disk attr. (#1054746, #1056019)

Samantha N. Bueno sbueno+anaconda at redhat.com
Tue Jan 21 15:10:14 UTC 2014


On Tue, Jan 21, 2014 at 03:56:39PM +0100, Vratislav Podzimek wrote:
> On Tue, 2014-01-21 at 09:43 -0500, Samantha N. Bueno wrote:
> > Fixing an error from commit
> > 6977f898cba63d0f215ca5e2be7c96bd451e8fc1.
> > 
> > Resolves: rhbz#1054746
> > Resolves: rhbz#1056019
> > ---
> >  pyanaconda/ui/gui/spokes/filter.py | 5 -----
> >  1 file changed, 5 deletions(-)
> > 
> > diff --git a/pyanaconda/ui/gui/spokes/filter.py b/pyanaconda/ui/gui/spokes/filter.py
> > index 24ad5e4..af40ac2 100644
> > --- a/pyanaconda/ui/gui/spokes/filter.py
> > +++ b/pyanaconda/ui/gui/spokes/filter.py
> > @@ -310,11 +310,6 @@ class OtherPage(FilterPage):
> >              paths = [d.name for d in disk.parents]
> >              selected = disk.name in selectedNames
> >  
> > -            store.append([True, selected, not disk.protected,
> > -                          disk.name, "", disk.model, size_str(disk.size),
> > -                          disk.vendor, disk.bus, disk.serial,
> > -                          disk.wwid, "\n".join(paths), "", "",
> > -                          "", "", ""])
> >              if not disk.vendor in vendors:
> >                  vendors.append(disk.vendor)
> Looks good to me, but I believe the commit message could be more
> informative so that it's clear why this code has to be removed.

That is true; I will expand it when I commit. Full disclosure for the
context of this thread: adding a specialized device to the disk store
was occurring twice with the addition of the above blurb in my prior
commit, and it was unnecessary. The tb was occurring since the above
attempted to access a disk attr not present on iscsi or fcoe devices.

Samantha


More information about the anaconda-patches mailing list