diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-03-15 12:11:09 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-03-15 12:11:09 +0200 |
commit | 66972a8ed32f71ad5ef46bb54e443aa6d99b2723 (patch) | |
tree | dd41ae77e39b1d7f4b055f757347df12fde0d00d | |
parent | 0208b90b5142ec3ebd83a0b578911f4a13fbb093 (diff) | |
download | acmeman-66972a8ed32f71ad5ef46bb54e443aa6d99b2723.tar.gz acmeman-66972a8ed32f71ad5ef46bb54e443aa6d99b2723.tar.bz2 |
Bugfix
* lib/App/Acmeman/Config.pm (_fixup): Use @path argument when
passing pathnames.
-rw-r--r-- | lib/App/Acmeman/Config.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/App/Acmeman/Config.pm b/lib/App/Acmeman/Config.pm index 614a46a..f566cb7 100644 --- a/lib/App/Acmeman/Config.pm +++ b/lib/App/Acmeman/Config.pm | |||
@@ -255,7 +255,7 @@ sub _fixup { | |||
255 | if ($k eq '*') { | 255 | if ($k eq '*') { |
256 | while (my ($name, $vref) = each %{$section}) { | 256 | while (my ($name, $vref) = each %{$section}) { |
257 | if (_is_section_ref($vref)) { | 257 | if (_is_section_ref($vref)) { |
258 | $self->_fixup($d->{section}, $vref, @_, $name); | 258 | $self->_fixup($d->{section}, $vref, @path, $name); |
259 | } | 259 | } |
260 | } | 260 | } |
261 | } else { | 261 | } else { |
@@ -264,7 +264,7 @@ sub _fixup { | |||
264 | $section->{$k} = {} ; | 264 | $section->{$k} = {} ; |
265 | $temp = 1; | 265 | $temp = 1; |
266 | } | 266 | } |
267 | $self->_fixup($d->{section}, $section->{$k}, @_, $k); | 267 | $self->_fixup($d->{section}, $section->{$k}, @path, $k); |
268 | delete $section->{$k} | 268 | delete $section->{$k} |
269 | if $temp && keys(%{$section->{$k}}) == 0; | 269 | if $temp && keys(%{$section->{$k}}) == 0; |
270 | } | 270 | } |
@@ -273,10 +273,10 @@ sub _fixup { | |||
273 | if ($d->{mandatory} && !exists($section->{$k})) { | 273 | if ($d->{mandatory} && !exists($section->{$k})) { |
274 | $self->error(exists($d->{section}) | 274 | $self->error(exists($d->{section}) |
275 | ? "mandatory section [" | 275 | ? "mandatory section [" |
276 | . join(' ', @_, $k) | 276 | . join(' ', @path, $k) |
277 | . "] not present" | 277 | . "] not present" |
278 | : "mandatory variable \"" | 278 | : "mandatory variable \"" |
279 | . join('.', @_, $k) | 279 | . join('.', @path, $k) |
280 | . "\" not set"); | 280 | . "\" not set"); |
281 | } | 281 | } |
282 | } | 282 | } |