Merge lp:~akopytov/percona-xtrabackup/bug1089375-2.0 into lp:percona-xtrabackup/2.0

Proposed by Alexey Kopytov on 2012-12-19
Status: Merged
Approved by: Alexey Kopytov on 2012-12-19
Approved revision: 488
Merged at revision: 488
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1089375-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 18 lines (+3/-3)
1 file modified
innobackupex (+3/-3)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1089375-2.0
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve on 2012-12-19
Review via email: mp+140605@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Approved (it's not my patch, but a contribution from Hartmut Holzgraefe <email address hidden> resubmitted as a 2.0-based MP).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innobackupex'
2--- innobackupex 2012-11-29 23:32:59 +0000
3+++ innobackupex 2012-12-19 09:22:21 +0000
4@@ -570,11 +570,11 @@
5 my $empty_dir = shift;
6 my $is_directory_empty_comment = shift;
7 if (! -d $empty_dir) {
8- die "$is_directory_empty_comment directory does not exist!";
9+ die "$is_directory_empty_comment directory '$empty_dir' does not exist!";
10 }
11- opendir (my $dh, $empty_dir) or die "Not a directory";
12+ opendir (my $dh, $empty_dir) or die "$is_directory_empty_comment directory '$empty_dir': Not a directory";
13 if ( ! scalar( grep { $_ ne "." && $_ ne ".." && $_ ne "my.cnf" && $_ ne "master.info"} readdir($dh)) == 0) {
14- die "$is_directory_empty_comment directory is not empty!";
15+ die "$is_directory_empty_comment directory '$empty_dir' is not empty!";
16 }
17 closedir($dh);
18 }

Subscribers

People subscribed via source and target branches