diff options
| author | fukachan <fukachan> | 2004-12-29 10:31:53 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-12-29 10:31:53 +0000 |
| commit | 8dfead8f95ee887e0c10703f1469857a3c5dfe80 (patch) | |
| tree | 9b8edbcc3affaebe39aa167d28774695645db3e3 /fml | |
| parent | cb136a12ad05f1a550614e835a9e71ef017ad29e (diff) | |
| download | fml8-8dfead8f95ee887e0c10703f1469857a3c5dfe80.tar.gz fml8-8dfead8f95ee887e0c10703f1469857a3c5dfe80.tar.bz2 fml8-8dfead8f95ee887e0c10703f1469857a3c5dfe80.zip | |
regen: care for a few old configurations
Diffstat (limited to 'fml')
| -rw-r--r-- | fml/lib/FML/Merge/FML4/Rules.pm | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/fml/lib/FML/Merge/FML4/Rules.pm b/fml/lib/FML/Merge/FML4/Rules.pm index 802d7bff..d88261db 100644 --- a/fml/lib/FML/Merge/FML4/Rules.pm +++ b/fml/lib/FML/Merge/FML4/Rules.pm @@ -302,6 +302,13 @@ sub translate return $s if defined $s; } + + if ($key eq 'TZone' && $value eq 'JST') { + $s = undef; + $s .= &$fp_rule_prefer_fml8_value($self, $diff, $key, $value); + return $s if defined $s; + } + if ($key eq 'TZONE_DST' && defined $value) { $s = undef; $s .= &$fp_rule_prefer_fml8_value($self, $diff, $key, $value); @@ -523,17 +530,17 @@ sub translate } - if ($key eq 'POSTFIX_VERP_DELIMITERS' && $value eq '+=') { + if ($key eq 'VARLOG_DIR' && $value eq 'var/log') { $s = undef; - $s .= "postfix_verp_delimiters = POSTFIX_VERP_DELIMITERS"; - $s .= "\n"; + $s .= &$fp_rule_prefer_fml8_value($self, $diff, $key, $value); return $s if defined $s; } - if ($key eq 'VARLOG_DIR' && $value eq 'var/log') { + if ($key eq 'POSTFIX_VERP_DELIMITERS' && $value eq '+=') { $s = undef; - $s .= &$fp_rule_prefer_fml8_value($self, $diff, $key, $value); + $s .= "postfix_verp_delimiters = POSTFIX_VERP_DELIMITERS"; + $s .= "\n"; return $s if defined $s; } @@ -805,6 +812,24 @@ sub translate return $s if defined $s; } + if ($key eq 'SMTPLOG' && defined $value) { + $s = undef; + $s .= &$fp_rule_prefer_fml8_value($self, $diff, $key, $value); + return $s if defined $s; + } + + if ($key eq 'CP' && defined $value) { + $s = undef; + $s .= &$fp_rule_prefer_fml8_value($self, $diff, $key, $value); + return $s if defined $s; + } + + if ($key eq 'RM' && defined $value) { + $s = undef; + $s .= &$fp_rule_prefer_fml8_value($self, $diff, $key, $value); + return $s if defined $s; + } + if ($key eq 'AUTO_REGISTRATION_DEFAULT_MODE' && defined $value) { $s = undef; $s .= &$fp_rule_convert($self, $diff, $key, $value); |