summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-11-12 17:22:45 +0000
committerOlivier Blin <oblin@mandriva.org>2005-11-12 17:22:45 +0000
commitc0e52ad1605b53331ead490b5e9c5a70f6a55890 (patch)
treeef3969aaf6cee015f9f8c007daaa0ca1586627fb
parentbd2f569f55e0992bf7c328b3ddd69a5a9bc91bec (diff)
downloaddrakx-backup-do-not-use-c0e52ad1605b53331ead490b5e9c5a70f6a55890.tar
drakx-backup-do-not-use-c0e52ad1605b53331ead490b5e9c5a70f6a55890.tar.gz
drakx-backup-do-not-use-c0e52ad1605b53331ead490b5e9c5a70f6a55890.tar.bz2
drakx-backup-do-not-use-c0e52ad1605b53331ead490b5e9c5a70f6a55890.tar.xz
drakx-backup-do-not-use-c0e52ad1605b53331ead490b5e9c5a70f6a55890.zip
fix wireless network list using iwlist (`` returns a defined empty string if the command fails)
-rw-r--r--perl-install/network/monitor.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/monitor.pm b/perl-install/network/monitor.pm
index e785ce469..a0a198128 100644
--- a/perl-install/network/monitor.pm
+++ b/perl-install/network/monitor.pm
@@ -28,7 +28,7 @@ sub list_wireless {
$results = `/usr/sbin/wpa_cli scan_results 2>/dev/null`;
$list = `/usr/sbin/wpa_cli list_networks 2>/dev/null`;
}
- if (defined $results && defined $list) {
+ if ($results && $list) {
#- bssid / frequency / signal level / flags / ssid
while ($results =~ /^((?:[0-9a-f]{2}:){5}[0-9a-f]{2})\t(\d+)\t(\d+)\t(.*?)\t(.*)$/mg) {
#- wpa_supplicant may list the network two times, use ||=