diff options
| author | fukachan <fukachan> | 2004-03-17 04:30:19 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-03-17 04:30:19 +0000 |
| commit | 78448ce19658306f853d5ba80a0dcd516357e074 (patch) | |
| tree | a410b19a70f3a24755a533d53f63d1174b725cc2 /fml/lib | |
| parent | 03b6f873619d17808f3ad0385fd6552656edc14d (diff) | |
| download | fml8-78448ce19658306f853d5ba80a0dcd516357e074.tar.gz fml8-78448ce19658306f853d5ba80a0dcd516357e074.tar.bz2 fml8-78448ce19658306f853d5ba80a0dcd516357e074.zip | |
clean up message alignment
Diffstat (limited to 'fml/lib')
| -rw-r--r-- | fml/lib/FML/Merge.pm | 11 | ||||
| -rw-r--r-- | fml/lib/FML/Merge/FML4/List.pm | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/fml/lib/FML/Merge.pm b/fml/lib/FML/Merge.pm index edaa3c1e..1202fe31 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.1.1.1 2004/03/16 12:58:20 fukachan Exp $ +# $FML: Merge.pm,v 1.2 2004/03/17 04:08:34 fukachan Exp $ # package FML::Merge; @@ -102,16 +102,16 @@ sub backup_old_config_files if (-f $src) { if ($mode eq 'move') { - printf STDERR "moving %-30s -> %-30s\n", $src, $dst; + printf STDERR "renaming %-30s -> %-30s\n", $src, $dst; rename($src, $dst) || croak("cannot rename $src $dst"); } elsif ($mode eq 'copy') { - printf STDERR "copying %-30s -> %-30s\n", $src, $dst; + printf STDERR "copying: %-30s -> %-30s\n", $src, $dst; use IO::Adapter::AtomicFile; IO::Adapter::AtomicFile->copy($src, $dst); } else { - print STDERR "unknown mode (DO NOTHING).\n"; + print STDERR "error: unknown mode (DO NOTHING).\n"; } } } @@ -165,8 +165,7 @@ sub disable_old_include_files for my $f (@$files) { my $file = $self->old_file_path($f); - print STDERR "disable $file\n"; - print STDERR " cp $file $file.bak\n"; + print STDERR "disable: $file\n"; use IO::Adapter::AtomicFile; IO::Adapter::AtomicFile->copy($file, "$file.bak"); my $wh = new FileHandle "> $file.tmp"; diff --git a/fml/lib/FML/Merge/FML4/List.pm b/fml/lib/FML/Merge/FML4/List.pm index b154d0e1..e0b311b3 100644 --- a/fml/lib/FML/Merge/FML4/List.pm +++ b/fml/lib/FML/Merge/FML4/List.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: List.pm,v 1.1.1.1 2004/03/16 12:58:20 fukachan Exp $ +# $FML: List.pm,v 1.2 2004/03/17 04:08:35 fukachan Exp $ # package FML::Merge::FML4::List; @@ -130,11 +130,12 @@ sub _write_without_comment my $tmp = sprintf("%s.new.%s", $dst, $$); unless (-f $src) { - print STDERR "ignore $src -> $dst\n"; + print STDERR "warning: $src not found, so not converted.\n"; return; } - print STDERR "cat $src > $dst\n"; + print STDERR "creating $dst\n"; + print STDERR " from $src\n"; use FileHandle; my $rh = new FileHandle $src; |