summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-05-22 16:35:23 +0200
committerAllan McRae <allan@archlinux.org>2013-05-29 14:17:21 +1000
commita36d4b2831fdb36a0c8ddaec5a023104932df73d (patch)
tree647f6b114ccf5280be20c584e6c2c29c65e2133a
parentcbc25c22fcb8ea12ba98386e1489bf8f02e4e86a (diff)
makepkg-template: Stop using given/when
given/when has been marked experimental in perl 5.18 because it will change it 5.20. if/else is ugly, but hiding the generated warning is no good solution either, so we us if/else for now. Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
-rwxr-xr-xscripts/makepkg-template.pl.in22
1 files changed, 8 insertions, 14 deletions
diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in
index 6997a835..7e377991 100755
--- a/scripts/makepkg-template.pl.in
+++ b/scripts/makepkg-template.pl.in
@@ -120,21 +120,15 @@ sub process_file {
if ($line =~ $template_marker) {
my $values = parse_template_line($line, $filename, $linenumber);
- given ($values->{command}) {
- when (['start', 'input']) {
- if ($nesting_level == 0) {
- $ret .= load_template($values);
- }
- }
-
- when ('end') {
- # nothing to do here, just for completeness
- }
-
- default {
- die sprintf(gettext("Unknown template marker '%s'\n"), $values->{command}),
- "$filename:$linenumber: $line";
+ if ($values->{command} eq "start" or $values->{command} eq "input") {
+ if ($nesting_level == 0) {
+ $ret .= load_template($values);
}
+ } elsif ($values->{command} eq "end") {
+ # nothing to do here, just for completeness
+ } else {
+ die sprintf(gettext("Unknown template marker '%s'\n"), $values->{command}),
+ "$filename:$linenumber: $line";
}
$nesting_level++ if $values->{command} eq "start";