From b3111e7e9c262d8c71e23a6dc78d5d7a888dacc3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 20 Mar 2012 19:52:33 +0000 Subject: perl_checker cleanups --- lib/network/connection/wireless.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/network/connection/wireless.pm') 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 -- cgit v1.2.1