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

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

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

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-12-17 03:36:27 +0000
+++ innobackupex	2012-12-20 06:31:22 +0000
@@ -551,11 +551,11 @@
     my $empty_dir = shift;
     my $is_directory_empty_comment = shift;
     if (! -d $empty_dir) {
-        die "$is_directory_empty_comment directory does not exist!";
+        die "$is_directory_empty_comment directory '$empty_dir' does not exist!";
     }
-    opendir (my $dh, $empty_dir) or die "Not a directory";
+    opendir (my $dh, $empty_dir) or die "$is_directory_empty_comment directory '$empty_dir': Not a directory";
     if ( ! scalar( grep { $_ ne "." && $_ ne ".." && $_ ne "my.cnf" && $_ ne "master.info"} readdir($dh)) == 0) {
-        die "$is_directory_empty_comment directory is not empty!";
+        die "$is_directory_empty_comment directory '$empty_dir' is not empty!";
     }
     closedir($dh);
 }