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

[Alexey Kopytov]

    Bug #1223716: innobackupex --help and --version doesn't work if source
                  destination isn't specifed

    Fixed innobackupex to not fail with an error when --help or --version
    are specified on the command line and the target directory argument is
    missing.

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param/506/

(centos6-64 was out of disk space)

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

=== modified file 'innobackupex.pl'
--- innobackupex.pl	2013-11-21 10:08:38 +0000
+++ innobackupex.pl	2013-12-29 19:09:07 +0000
@@ -1660,7 +1660,7 @@
 #
 sub usage {
    my $msg = shift || '';
-   pod2usage({ -msg => $msg, -verbose => 1});
+   pod2usage({ -msg => $msg, -verbose => 1, -exitval => "NOEXIT"});
    return 0;
 }
 
@@ -3744,6 +3744,17 @@
                         \$option_force_non_empty_dirs
     );
 
+    if ($option_help) {
+        # print help text and exit
+        usage();
+        exit(0);
+    }
+    if ($option_version) {
+        # print program version and copyright
+        print_version();
+        exit(0);
+    }
+
     if (@ARGV == 0) {
         die "You must specify the backup directory.\n";
     } elsif (@ARGV > 1) {
@@ -3754,16 +3765,6 @@
         # failed to read options
         die "Bad command line arguments\n";
     }
-    if ($option_help) {
-        # print help text and exit
-        usage();
-        exit(0);
-    }
-    if ($option_version) {
-        # print program version and copyright
-        print_version();
-        exit(0);
-    }
 
     if ($option_defaults_file && $option_defaults_extra_file) {
         die "--defaults-file and --defaults-extra-file " .

=== added file 'test/t/bug1223716.sh'
--- test/t/bug1223716.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1223716.sh	2013-12-29 19:09:07 +0000
@@ -0,0 +1,14 @@
+########################################################################
+# Bug #1223716: innobackupex --help and --version doesn't work if source
+#               destination isn't specifed
+########################################################################
+
+innobackupex --help
+
+innobackupex --version
+
+# Check that specifying the directory argument still works
+
+innobackupex --help $topdir
+
+innobackupex --version $topdir

=== modified file 'test/t/distribution_message.sh'
--- test/t/distribution_message.sh	2013-11-15 11:01:25 +0000
+++ test/t/distribution_message.sh	2013-12-29 19:09:07 +0000
@@ -4,8 +4,7 @@
 
 [ -z ${XB_DISTRIBUTION:-} ] && skip_test "Requires XB_DISTRIBUTION to be set"
 
-# Remove the argument when bug #1223716 is fixed
-innobackupex --version $topdir/backup
+innobackupex --version
 
 link="http://www.percona.com/xb/$XB_DISTRIBUTION"