rpms/wlassistant/devel wlassistant-0.5.5-devparsercleanup.patch, NONE, 1.1 wlassistant.spec, 1.5, 1.6

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29797/devel

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant-0.5.5-devparsercleanup.patch 
Log Message:

Resolve bugzilla 205886


wlassistant-0.5.5-devparsercleanup.patch:

--- NEW FILE wlassistant-0.5.5-devparsercleanup.patch ---
--- wlassistant-0.5.5/src/wlassistant.cpp.BAD	2006-09-11 10:27:30.000000000 -0500
+++ wlassistant-0.5.5/src/wlassistant.cpp	2006-09-11 10:30:22.000000000 -0500
@@ -973,13 +973,18 @@
 {
 	WANetParams empty;
 	QString o = runCommand( Commands.cmd( "iwconfig_status", empty ) );
-	QStringList ol = QStringList::split("\n\n", o);
+	QStringList ol = QStringList::split("\n\n", o); // do we really need two
 	int c = ol.count();
 	QStringList ifList = QStringList();
 	for (int i = 0; i < c; i++) {
 		o = ol[i];
-		if ( o.find("no wireless extensions")==-1 ) //string not found
-			ifList << o.left(o.find("  "));
+		if ( o.find("no wireless extensions")==-1 ) {
+			if ( o.find("Warning:") == -1 ) {
+				QString interface = o.left(o.find(" "));
+				if ( interface.length() > 1 )
+					ifList << interface;
+			}
+		}
 	}
 	return ifList;
 }


Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wlassistant.spec	4 Sep 2006 06:16:45 -0000	1.5
+++ wlassistant.spec	11 Sep 2006 16:10:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -16,6 +16,7 @@
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.5-rpath.patch
+Patch1:		wlassistant-0.5.5-devparsercleanup.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -31,6 +32,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
@@ -84,6 +86,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Mon Sep 11 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.5-4
+- fix bz 205886
+
 * Mon Sep  4 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.5-3
 - add BR: gettext