diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-20 19:52:33 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-20 19:52:33 +0000 |
| commit | b3111e7e9c262d8c71e23a6dc78d5d7a888dacc3 (patch) | |
| tree | d42205550d30ec092f9743748bcec938017f985b /lib/network/connection/wireless.pm | |
| parent | 683619174a6cd634655ac6a489b5a6efb1b5b3cc (diff) | |
| download | drakx-net-b3111e7e9c262d8c71e23a6dc78d5d7a888dacc3.tar drakx-net-b3111e7e9c262d8c71e23a6dc78d5d7a888dacc3.tar.gz drakx-net-b3111e7e9c262d8c71e23a6dc78d5d7a888dacc3.tar.bz2 drakx-net-b3111e7e9c262d8c71e23a6dc78d5d7a888dacc3.tar.xz drakx-net-b3111e7e9c262d8c71e23a6dc78d5d7a888dacc3.zip | |
perl_checker cleanups
Diffstat (limited to 'lib/network/connection/wireless.pm')
| -rw-r--r-- | lib/network/connection/wireless.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm index 4f86f17..89d57dd 100644 --- a/lib/network/connection/wireless.pm +++ b/lib/network/connection/wireless.pm @@ -388,7 +388,7 @@ sub load_interface_settings { $self->{hide_passwords} = 1; # override ifcfg with network-specific settings if available my $network = $self->get_selected_network; - $self->{ifcfg}= $network ? + $self->{ifcfg} = $network ? get_network_ifcfg($network->{ap}) || get_network_ifcfg($network->{essid}) : $self->{ifcfg}; @@ -970,7 +970,7 @@ sub wpa_supplicant_read_conf() { if ($network) { #- in a "network = {}" block # value is either the string with "quotes" - or a full-length string - if (/^\s*(\w+)=\s*(?|([^"].*)|("[^"]*")).*$/) { + if (/^\s*(\w+)=\s*(?|([^"].*)|("[^"]*"))/) { $network->{$1} = $2; } elsif (/^\}/) { #- end of network block |