Changeset 106
- Timestamp:
- 04/08/10 19:32:58 (8 years ago)
- Files:
-
- trunk/omnipitr/lib/OmniPITR/Program/Archive.pm (modified) (1 diff)
- trunk/omnipitr/lib/OmniPITR/Program/Restore.pm (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/omnipitr/lib/OmniPITR/Program/Archive.pm
r105 r106 370 370 } 371 371 372 $self->log->fatal( 'Given segment name is not valid (%s)', $self->{ 'segment' } ) unless basename( $self->{ 'segment' } ) =~ m{\A[a-f 0-9]{24}\z};372 $self->log->fatal( 'Given segment name is not valid (%s)', $self->{ 'segment' } ) unless basename( $self->{ 'segment' } ) =~ m{\A[a-fA-F0-9]{24}\z}; 373 373 my $segment_file_name = $self->{ 'segment' }; 374 374 $segment_file_name = File::Spec->catfile( $self->{ 'data-dir' }, $self->{ 'segment' } ) unless $self->{ 'segment' } =~ m{^/}; trunk/omnipitr/lib/OmniPITR/Program/Restore.pm
r104 r106 122 122 for my $file ( @content ) { 123 123 $file =~ s/\Q$extension\E\z//; 124 next unless $file =~ m{\A[a-f 0-9]{24}\z};124 next unless $file =~ m{\A[a-fA-F0-9]{24}\z}; 125 125 next unless $file lt $last_important; 126 126 push @too_old, $file; … … 401 401 $self->log->fatal( 'Given data-dir (%s) is not valid', $self->{ 'data-dir' } ) unless -d $self->{ 'data-dir' } && -f File::Spec->catfile( $self->{ 'data-dir' }, 'PG_VERSION' ); 402 402 403 $self->log->fatal( 'Given segment name is not valid (%s)', $self->{ 'segment' } ) unless $self->{ 'segment' } =~ m{\A[a-f 0-9]{24}\z};403 $self->log->fatal( 'Given segment name is not valid (%s)', $self->{ 'segment' } ) unless $self->{ 'segment' } =~ m{\A[a-fA-F0-9]{24}\z}; 404 404 405 405 $self->log->fatal( 'Given source (%s) is not a directory', $self->{ 'source' }->{ 'path' } ) unless -d $self->{ 'source' }->{ 'path' };