diff options
| author | fukachan <fukachan> | 2001-02-22 04:40:44 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2001-02-22 04:40:44 +0000 |
| commit | 07d3d9abb13b704cf6988c83aa37b761a03200cc (patch) | |
| tree | ebdd932ff4e67be14b922ca468498cc96e519fac /fml | |
| parent | bb5b6a9afddd999833a54f8f5a84696a9e4f730d (diff) | |
| download | fml8-07d3d9abb13b704cf6988c83aa37b761a03200cc.tar.gz fml8-07d3d9abb13b704cf6988c83aa37b761a03200cc.tar.bz2 fml8-07d3d9abb13b704cf6988c83aa37b761a03200cc.zip | |
disable strftime() expansion which causes conflictions
Diffstat (limited to 'fml')
| -rw-r--r-- | fml/lib/FML/Config.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm index b5025d4b..1e286dd0 100644 --- a/fml/lib/FML/Config.pm +++ b/fml/lib/FML/Config.pm @@ -158,7 +158,10 @@ sub expand_variables my ($self) = @_; _expand_variables( \%_default_fml_config ); _expand_variables( \%_fml_config ); - _expand_special_syntax( \%_fml_config ); + + # disable POSIX strftime() expansion which conflicts + # printf() expansion + # _expand_special_syntax( \%_fml_config ); } @@ -215,14 +218,14 @@ sub _expand_special_syntax my $use_strftime = 0; for my $x ( @order ) { - if ($config->{ $x } =~ /\%/) { $use_strftime = 1;} + if ($config->{ $x } =~ /\%[a-zA-Z]/) { $use_strftime = 1;} } if ($use_strftime) { eval qq{ require POSIX; import POSIX qw(strftime);}; unless ($@) { for my $x ( @order ) { - if ($config->{ $x } =~ /\%/) { + if ($config->{ $x } =~ /\%[a-zA-Z]/) { $config->{ $x } = strftime($config->{ $x }, localtime); } } |
