1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00

Fixed issue #108: Incompatibility with Perl 5.10.1

This commit is contained in:
David Steele
2015-06-21 12:06:13 -04:00
parent 49f1a3e481
commit 61dfeca3c1
20 changed files with 216 additions and 58 deletions

View File

@@ -761,7 +761,7 @@ sub BackRestTestBackup_ManifestReference
}
# Find all file sections
foreach my $strSectionFile (sort(keys $oManifestRef))
foreach my $strSectionFile (sort(keys(%$oManifestRef)))
{
# Skip non-file sections
if ($strSectionFile !~ /\:file$/)
@@ -769,7 +769,7 @@ sub BackRestTestBackup_ManifestReference
next;
}
foreach my $strFile (sort(keys ${$oManifestRef}{$strSectionFile}))
foreach my $strFile (sort(keys(%{${$oManifestRef}{$strSectionFile}})))
{
if (!defined($strReference))
{
@@ -1311,7 +1311,7 @@ sub BackRestTestBackup_RestoreCompare
if (!$bSynthetic)
{
foreach my $strTablespaceName (keys(${$oExpectedManifestRef}{&MANIFEST_SECTION_BACKUP_PATH}))
foreach my $strTablespaceName (keys(%{${$oExpectedManifestRef}{&MANIFEST_SECTION_BACKUP_PATH}}))
{
if (defined(${$oExpectedManifestRef}{&MANIFEST_SECTION_BACKUP_PATH}{$strTablespaceName}{&MANIFEST_SUBKEY_LINK}))
{

View File

@@ -965,7 +965,7 @@ sub BackRestTestCommon_ConfigRemap
# Rewrite remap section
delete($oConfig{"${strStanza}:restore:tablespace-map"});
foreach my $strRemap (sort(keys $oRemapHashRef))
foreach my $strRemap (sort(keys(%$oRemapHashRef)))
{
my $strRemapPath = ${$oRemapHashRef}{$strRemap};
@@ -1028,7 +1028,7 @@ sub BackRestTestCommon_ConfigRecovery
# Rewrite remap section
delete($oConfig{"${strStanza}:restore:recovery-setting"});
foreach my $strOption (sort(keys $oRecoveryHashRef))
foreach my $strOption (sort(keys(%$oRecoveryHashRef)))
{
$oConfig{"${strStanza}:restore:recovery-setting"}{$strOption} = ${$oRecoveryHashRef}{$strOption};
}

View File

@@ -71,7 +71,7 @@ sub argvWriteTest
if (defined($$oOption{boolean}))
{
foreach my $strKey (keys $$oOption{boolean})
foreach my $strKey (keys(%{$$oOption{boolean}}))
{
if ($$oOption{boolean}{$strKey})
{
@@ -86,7 +86,7 @@ sub argvWriteTest
if (defined($$oOption{option}))
{
foreach my $strKey (keys $$oOption{option})
foreach my $strKey (keys(%{$$oOption{option}}))
{
$ARGV[@ARGV] = "--${strKey}=$$oOption{option}{$strKey}";
}

View File

@@ -11,13 +11,13 @@ use strict;
use warnings FATAL => qw(all);
use Carp qw(confess);
use Cwd 'abs_path';
use Cwd qw(abs_path);
use Exporter qw(import);
use Fcntl ':mode';
use Fcntl qw(:mode);
use File::Basename;
use File::stat;
use POSIX qw(ceil);
use Scalar::Util 'blessed';
use Scalar::Util qw(blessed);
use Time::HiRes qw(gettimeofday usleep);
use lib dirname($0) . '/../lib';
@@ -578,7 +578,7 @@ sub BackRestTestFile_Test
my $strManifest;
# Validate the manifest
foreach my $strName (sort(keys $oManifestHash{name}))
foreach my $strName (sort(keys(%{$oManifestHash{name}})))
{
if (!defined($strManifest))
{