Re: [PATCH 14/14] Handle existing volumes without labels.

[David Lehman <dlehman redhat com>]

I'm a little confused about how one version can work while the other
does not, but the important thing is that your patch works.

Ack.


On Mon, 2009-03-02 at 10:13 -1000, David Cantrell wrote:
> David Lehman wrote:
> > On Sun, 2009-03-01 at 20:32 -1000, David Cantrell wrote:
> >> Existing volume may lack a label.  If it's there, add it to the
> >> list, otherwise just go with the defaults.
> >> ---
> >>  iw/partition_ui_helpers_gui.py |   19 ++++++++++---------
> >>  1 files changed, 10 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py
> >> index ad7303e..947bfbb 100644
> >> --- a/iw/partition_ui_helpers_gui.py
> >> +++ b/iw/partition_ui_helpers_gui.py
> >> @@ -86,16 +86,17 @@ def createMountPointCombo(request, excludeMountPoints=[]):
> >>  
> >>      mntptlist = []
> >>      label = getattr(request.format, "label", None)
> >> -    if request.exists and label.startswith("/"):
> >   +    if request.exists and label and label.startswith("/"):
> > 
> > Should cover it, no?
> 
> Doesn't catch it on my system.  Still get a traceback.
> 
> > 
> >> -        mntptlist.append(label)
> >> -        idx = 0
> >> -    
> >> +    if label:
> >> +        if request.exists and label.startswith("/"):
> >> +            mntptlist.append(label)
> >> +            idx = 0
> >> +
> > 
> > The whitespace changes below are good.
> > 
> >>      for p in defaultMountPoints:
> >> -	if p in excludeMountPoints:
> >> -	    continue
> >> -	
> >> -	if not p in mntptlist and (p[0] == "/"):
> >> -	    mntptlist.append(p)
> >> +        if p in excludeMountPoints:
> >> +            continue
> >> +
> >> +        if not p in mntptlist and (p[0] == "/"):
> >> +            mntptlist.append(p)
> >>  
> >>      map(mountCombo.append_text, mntptlist)
> >>  
> > 
> > _______________________________________________
> > Anaconda-devel-list mailing list
> > Anaconda-devel-list redhat com
> > https://www.redhat.com/mailman/listinfo/anaconda-devel-list
> 
>