wicd

Merge lp://staging/~fox1991/wicd/fox into lp://staging/wicd/1.6

fox
Merge into experimental

Proposed by fox91 on 2011-07-03

Status:	Merged
Merged at revision:	576
Proposed branch:	lp://staging/~fox1991/wicd/fox
Merge into:	lp://staging/wicd/1.6
Diff against target:	395 lines (+157/-156) 4 files modified cli/wicd-cli.py (+149/-147) curses/wicd-curses.py (+3/-6) gtk/gui.py (+3/-2) wicd/wicd-daemon.py (+2/-1)
To merge this branch:	bzr merge lp://staging/~fox1991/wicd/fox
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
David Paleino		2011-07-03	Needs Information on 2011-08-07
Review via email: mp+66727@code.staging.launchpad.net

Description of the change

I fixed a little bug in the clients (it's a silly thing but i didn't like it):
when you connect to a wireless network sometimes the statusbar message was a bit confusing, instead of showing <essid>: <connecting status> it showed None or another essid instead of the one of the network it was connecting to.

Then i noticed i little bug in the cli client, if using -c without -n it raised an exception.
in the cli-client i changed tabs into 4 spaces

Revision history for this message

David Paleino (dpaleino) wrote on 2011-08-07:

Hello,

I merged your rev. 572, and will soon push it.

However, I don't quite understand your 573. Ok, there might be some mixed tabs-and-spaces indentation, but that would've been best addressed in a separate commit. If there's a real fix, it's hidden in that huge diff.

Would you mind pointing out the actual fix? :)

Thanks,
David

review: Needs Information

Revision history for this message

fox91 (fox1991) wrote on 2011-08-08:

573 is a fix for cli/wicd-cli.py and a conversion from tabs to four spaces (there was a mix!).

The fix is in these lines:

197 last = None
198 if check is not None:
199 while check():

If check is None an exception was raised (reproducible with launching the script with incorrect parameters)

Revision history for this message

David Paleino (dpaleino) wrote on 2011-08-08:

On Mon, 08 Aug 2011 09:22:17 -0000, fox91 wrote:

> 573 is a fix for cli/wicd-cli.py and a conversion from tabs to four spaces
> (there was a mix!).
>
> The fix is in these lines:
>
> 197 last = None
> 198 if check is not None:
> 199 while check():
>
> If check is None an exception was raised (reproducible with launching the
> script with incorrect parameters)

Ah, I see.

Would you mind making a branch with those two things (fix + tabs→spaces) fixed
in different commits? That would be cleaner for the repository history (and
easier for me, so that I can just merge your new branch).

Thank you,
David

--
. ''`. Debian developer | http://wiki.debian.org/DavidPaleino
: :' : Linuxer #334216 --|-- http://www.hanskalabs.net/
`. `'` GPG: 1392B174 ----|---- http://deb.li/dapal
`- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174