diff options
| author | fukachan <fukachan> | 2005-08-20 01:27:31 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2005-08-20 01:27:31 +0000 |
| commit | 2037ed63a4df3dada3a8cbb6c9fd208b53d8f8ee (patch) | |
| tree | 45aadbfce69a906c6966b16e72a25f5a4825b036 | |
| parent | c5a7ce8f19ae8cce4bbfedde686c2fa46b1ae7f0 (diff) | |
| download | fml8-2037ed63a4df3dada3a8cbb6c9fd208b53d8f8ee.tar.gz fml8-2037ed63a4df3dada3a8cbb6c9fd208b53d8f8ee.tar.bz2 fml8-2037ed63a4df3dada3a8cbb6c9fd208b53d8f8ee.zip | |
merge_to_file -> merge_into_file
| -rw-r--r-- | fml/lib/FML/Config.pm | 4 | ||||
| -rw-r--r-- | fml/lib/FML/Config/Menu.pm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm index d5157d4d..9ed61445 100644 --- a/fml/lib/FML/Config.pm +++ b/fml/lib/FML/Config.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: Config.pm,v 1.98 2004/11/21 05:32:05 fukachan Exp $ +# $FML: Config.pm,v 1.99 2005/05/26 09:36:45 fukachan Exp $ # package FML::Config; @@ -553,7 +553,7 @@ sub read # Arguments: OBJ($self) STR($file) HASH_REF($hash_ref) # Side Effects: none # Return Value: none -sub merge_to_file +sub merge_into_file { my ($self, $file, $hash_ref) = @_; my $done = 0; # NOT USED ? diff --git a/fml/lib/FML/Config/Menu.pm b/fml/lib/FML/Config/Menu.pm index 47ef96e8..00a0a31a 100644 --- a/fml/lib/FML/Config/Menu.pm +++ b/fml/lib/FML/Config/Menu.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: Menu.pm,v 1.5 2005/06/04 08:51:29 fukachan Exp $ +# $FML: Menu.pm,v 1.6 2005/08/10 12:55:32 fukachan Exp $ # package FML::Config::Menu; @@ -262,7 +262,7 @@ sub rewrite_config_cf my $diff = $self->_get_diff_between_hash_ref($diff_org, $diff_new); # 4. rewrite - $config->merge_to_file($cf_file, $diff); + $config->merge_into_file($cf_file, $diff); for my $k (keys %$diff) { print "# configured by CUI.\n"; print "$k = $diff->{ $k }\n"; |