summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-11-12 17:23:29 +0000
committerOlivier Blin <oblin@mandriva.org>2005-11-12 17:23:29 +0000
commitbf62a183b298c017d41d64cb1f82510bbbe5dc00 (patch)
tree46512a6d0ab20ccf0ea955545ada41d1e02fd87a /perl-install
parent3777ec91ebb1937a80f95369ad4cba324e781d8a (diff)
downloaddrakx-backup-do-not-use-bf62a183b298c017d41d64cb1f82510bbbe5dc00.tar
drakx-backup-do-not-use-bf62a183b298c017d41d64cb1f82510bbbe5dc00.tar.gz
drakx-backup-do-not-use-bf62a183b298c017d41d64cb1f82510bbbe5dc00.tar.bz2
drakx-backup-do-not-use-bf62a183b298c017d41d64cb1f82510bbbe5dc00.tar.xz
drakx-backup-do-not-use-bf62a183b298c017d41d64cb1f82510bbbe5dc00.zip
fix wireless network list using iwlist (`` returns a defined empty string if the command fails)
Diffstat (limited to 'perl-install')
-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 ||=