diff options
| author | fukachan <fukachan> | 2004-12-09 03:35:36 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-12-09 03:35:36 +0000 |
| commit | a1619cb880a686ffe393c4952d6e1ee7be3e91b6 (patch) | |
| tree | c0a8e442549f604c30b38c1c014a2aac4604d04b /fml/lib/FML/Merge.pm | |
| parent | e230b288bf6fff3082fc13017acef36e26ed6482 (diff) | |
| download | fml8-a1619cb880a686ffe393c4952d6e1ee7be3e91b6.tar.gz fml8-a1619cb880a686ffe393c4952d6e1ee7be3e91b6.tar.bz2 fml8-a1619cb880a686ffe393c4952d6e1ee7be3e91b6.zip | |
enhance arguments of translate() call to pass $diff.
Diffstat (limited to 'fml/lib/FML/Merge.pm')
| -rw-r--r-- | fml/lib/FML/Merge.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fml/lib/FML/Merge.pm b/fml/lib/FML/Merge.pm index 05cba3e1..4643bffa 100644 --- a/fml/lib/FML/Merge.pm +++ b/fml/lib/FML/Merge.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Merge.pm,v 1.13 2004/11/25 12:21:39 fukachan Exp $ +# $FML: Merge.pm,v 1.14 2004/12/05 16:19:05 fukachan Exp $ # package FML::Merge; @@ -418,7 +418,7 @@ sub _inject_diff_into_config_cf $y =~ s/\n/\n# /gm; print $wh "# $k => $y\n"; - if ($x = $config_ph->translate($k, $v)) { + if ($x = $config_ph->translate($diff, $k, $v)) { print $wh $x ,"\n\n"; } } |