diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-04-14 15:39:03 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-04-14 15:39:03 +0000 |
| commit | 4f3c32546b547af6262d8930a45dba1424528eeb (patch) | |
| tree | bddfab1058bf96cc9d76de9ff6ae4356b3cdc24b /lib | |
| parent | d05d91c1964a43c3e5c80a2681dcbf76eca16ca6 (diff) | |
| download | perl-MDK-Common-4f3c32546b547af6262d8930a45dba1424528eeb.tar perl-MDK-Common-4f3c32546b547af6262d8930a45dba1424528eeb.tar.gz perl-MDK-Common-4f3c32546b547af6262d8930a45dba1424528eeb.tar.bz2 perl-MDK-Common-4f3c32546b547af6262d8930a45dba1424528eeb.tar.xz perl-MDK-Common-4f3c32546b547af6262d8930a45dba1424528eeb.zip | |
decode ' inside '' properly in getVarsFromSh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MDK/Common.pm.pl | 2 | ||||
| -rw-r--r-- | lib/MDK/Common/System.pm | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/MDK/Common.pm.pl b/lib/MDK/Common.pm.pl index 5f53635..51090c5 100644 --- a/lib/MDK/Common.pm.pl +++ b/lib/MDK/Common.pm.pl @@ -73,7 +73,7 @@ our @ISA = qw(Exporter); # perl_checker: RE-EXPORT-ALL our @EXPORT = map { @$_ } map { values %{'MDK::Common::' . $_ . 'EXPORT_TAGS'} } grep { /::$/ } keys %MDK::Common::; -our $VERSION = "1.2.17"; +our $VERSION = "1.2.18"; 1; EOF diff --git a/lib/MDK/Common/System.pm b/lib/MDK/Common/System.pm index 900f6aa..7ff4e4c 100644 --- a/lib/MDK/Common/System.pm +++ b/lib/MDK/Common/System.pm @@ -341,7 +341,12 @@ sub getVarsFromSh { s/#.*//; # remove comments s/^\s*//; # leading space my ($v, $val) = /^(\w+)=(.*)/ or next; - $val = $1 if $val =~ /^"(.*)"$/ || $val =~ /^'(.*)'$/; + if ($val =~ /^"(.*)"$/) { + $val = $1; + } elsif ($val =~ /^'(.*)'$/) { + $val = $1; + $val =~ s/(^|[^'])'\\''/$1'/g; + } $l{$v} = $val; } %l; |