db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-03-05 15:05:48 +02:00
Code Issues Releases Activity

Allow file keys to be validated on remove.

Browse Source
This commit is contained in:
David Steele 2015-01-21 13:57:58 -05:00
parent ba7a939798
commit ade9ad78b4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/BackRest/Manifest.pm
View File

@ -291,7 +291,7 @@ sub remove
my $oManifest = $self->{oManifest}; my $oManifest = $self->{oManifest};
# Make sure the keys are valid # Make sure the keys are valid
# $self->valid($strSection, $strKey, $strSubKey); $self->valid($strSection, $strKey, $strSubKey, undef, true);
if (defined($strSubKey)) if (defined($strSubKey))
{ {
@ -314,6 +314,8 @@ sub valid
my $strSection = shift; my $strSection = shift;
my $strKey = shift; my $strKey = shift;
my $strSubKey = shift; my $strSubKey = shift;
my $strValue = shift;
my $bDelete = shift;
# Section and key must always be defined # Section and key must always be defined
if (!defined($strSection) || !defined($strKey)) if (!defined($strSection) || !defined($strKey))
@ -321,8 +323,16 @@ sub valid
confess &log(ASSERT, 'section or key is not defined'); confess &log(ASSERT, 'section or key is not defined');
} }
# Default bDelete
$bDelete = defined($bDelete) ? $bDelete : false;
if ($strSection =~ /^.*\:(file|path|link)$/ && $strSection !~ /^backup\:path$/) if ($strSection =~ /^.*\:(file|path|link)$/ && $strSection !~ /^backup\:path$/)
{ {
if (!defined($strSubKey) && $bDelete)
{
return true;
}
my $strPath = (split(':', $strSection))[0]; my $strPath = (split(':', $strSection))[0];
my $strType = (split(':', $strSection))[1]; my $strType = (split(':', $strSection))[1];