diff options
| author | fukachan <fukachan> | 2004-12-30 04:35:48 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-12-30 04:35:48 +0000 |
| commit | e46ed34390659aadcc0d322bdfa56bc2934d0ac8 (patch) | |
| tree | 8ecfe5bb4f050b5b41f969f972679da600570d2f /fml/lib | |
| parent | 4b62caf61b35e27a3b645a6bf1fb8b87c92930ab (diff) | |
| download | fml8-e46ed34390659aadcc0d322bdfa56bc2934d0ac8.tar.gz fml8-e46ed34390659aadcc0d322bdfa56bc2934d0ac8.tar.bz2 fml8-e46ed34390659aadcc0d322bdfa56bc2934d0ac8.zip | |
cosmetic changes: $VARIABLE format, "\n".
Diffstat (limited to 'fml/lib')
| -rw-r--r-- | fml/lib/FML/Merge.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fml/lib/FML/Merge.pm b/fml/lib/FML/Merge.pm index c065069d..737b04f5 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.15 2004/12/09 03:35:36 fukachan Exp $ +# $FML: Merge.pm,v 1.16 2004/12/29 08:21:50 fukachan Exp $ # package FML::Merge; @@ -416,11 +416,14 @@ sub _inject_diff_into_config_cf $v = $diff->{ $k }; $y = $v; $y =~ s/\n/\n# /gm; - print $wh "# $k => $y\n"; + print $wh "# \$$k => $y\n"; if ($x = $config_ph->translate($diff, $k, $v)) { print $wh $x ,"\n\n"; } + else { + print $wh "\n"; + } } print $wh "\n"; |