Changeset 123 for trunk/omnipitr
- Timestamp:
- 04/19/10 15:07:00 (8 years ago)
- Files:
-
- trunk/omnipitr/lib/OmniPITR/Program/Archive.pm (modified) (3 diffs)
- trunk/omnipitr/lib/OmniPITR/Program/Restore.pm (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/omnipitr/lib/OmniPITR/Program/Archive.pm
r121 r123 10 10 use File::Basename; 11 11 use File::Spec; 12 use File::Path qw( m ake_path remove_tree );12 use File::Path qw( mkpath rmtree ); 13 13 use File::Copy; 14 14 use Storable; … … 111 111 sub cleanup { 112 112 my $self = shift; 113 r emove_tree( $self->{ 'temp-dir' } );113 rmtree( $self->{ 'temp-dir' } ); 114 114 unlink $self->{ 'state-file' } if $self->{ 'state-file' }; 115 115 return; … … 230 230 my $self = shift; 231 231 my $full_temp_dir = File::Spec->catfile( $self->{ 'temp-dir' }, basename( $PROGRAM_NAME ), basename( $self->{ 'segment' } ) ); 232 m ake_path( $full_temp_dir );232 mkpath( $full_temp_dir ); 233 233 $self->{ 'temp-dir' } = $full_temp_dir; 234 234 return; trunk/omnipitr/lib/OmniPITR/Program/Restore.pm
r116 r123 10 10 use File::Basename; 11 11 use File::Spec; 12 use File::Path qw( m ake_path remove_tree );12 use File::Path qw( mkpath rmtree ); 13 13 use File::Copy; 14 14 use Storable; … … 132 132 my $xlog_dir = File::Spec->catfile( $self->{ 'temp-dir' }, 'pg_xlog' ); 133 133 my $xlog_file = File::Spec->catfile( $xlog_dir, $segment_name ); 134 m ake_path( $xlog_dir );134 mkpath( $xlog_dir ); 135 135 136 136 my $comment = 'Copying segment ' . $segment_name . ' to ' . $xlog_file; … … 157 157 chdir $previous_dir; 158 158 159 r emove_tree( $xlog_dir );159 rmtree( $xlog_dir ); 160 160 return 1 unless $result->{ 'error_code' }; 161 161 … … 420 420 my $code = shift; 421 421 422 r emove_tree( $self->{ 'temp-dir' } ) if $self->{ 'temp-dir-prepared' };422 rmtree( $self->{ 'temp-dir' } ) if $self->{ 'temp-dir-prepared' }; 423 423 424 424 exit( $code ); … … 439 439 return if $self->{ 'temp-dir-prepared' }; 440 440 my $full_temp_dir = File::Spec->catfile( $self->{ 'temp-dir' }, basename( $PROGRAM_NAME ) ); 441 m ake_path( $full_temp_dir );441 mkpath( $full_temp_dir ); 442 442 $self->{ 'temp-dir' } = $full_temp_dir; 443 443 $self->{ 'temp-dir-prepared' } = 1;