Merge lp:~percona-dev/percona-xtrabackup/docs-updates-bug-783453-F into lp:percona-xtrabackup/2.0

Proposed by Rodrigo Gadea
Status: Rejected
Rejected by: Stewart Smith
Proposed branch: lp:~percona-dev/percona-xtrabackup/docs-updates-bug-783453-F
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 19 lines (+4/-4)
1 file modified
patches/tar4ibd_libtar-1.2.11.patch (+4/-4)
To merge this branch: bzr merge lp:~percona-dev/percona-xtrabackup/docs-updates-bug-783453-F
Reviewer Review Type Date Requested Status
Stewart Smith (community) Needs Fixing
Valentine Gostev (community) Approve
Review via email: mp+62231@code.launchpad.net

Description of the change

Sorry for the noise! Still getting used to bzr...
Also updates in:
http://www.percona.com/docs/wiki/percona-xtrabackup:tar4ibd:start?&#special_considerations

To post a comment you must log in.
Revision history for this message
Valentine Gostev (longbow) wrote :

looks ok

review: Approve
Revision history for this message
Stewart Smith (stewart) wrote :

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/Host=ubuntu-lucid-64bit,xtrabackuptarget=innodb51_builtin/16/console
Building tar4ibd
patching file lib/Makefile.in
patching file lib/append.c
patching file lib/extract.c
patching file lib/libtar.h
patching file lib/util.c
patching file libtar/Makefile.in
patching file libtar/libtar.c
Hunk #6 FAILED at 266.
1 out of 9 hunks FAILED -- saving rejects to file libtar/libtar.c.rej
Build step 'Use builders from another project' marked build as failure
[WARNINGS] Skipping publisher since build result is FAILURE
Recording test results
Finished: FAILURE

review: Needs Fixing
Revision history for this message
Stewart Smith (stewart) wrote :

We've merged another fix a long time ago for this bug.

Unmerged revisions

258. By Rodrigo Gadea

Removed options -g and -z from Usage

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/tar4ibd_libtar-1.2.11.patch'
2--- patches/tar4ibd_libtar-1.2.11.patch 2011-03-15 21:58:13 +0000
3+++ patches/tar4ibd_libtar-1.2.11.patch 2011-05-25 03:16:28 +0000
4@@ -531,11 +531,11 @@
5 void
6 usage()
7 {
8-- printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n",
9-+ printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t < filename.tar\n",
10+- printf("Usage: %s [-C rootdir] -x|-t filename.tar\n",
11++ printf("Usage: %s [-C rootdir] -x|-t < filename.tar\n",
12 progname);
13-- printf(" %s [-C rootdir] [-g] [-z] -c filename.tar ...\n",
14-+ printf(" %s [-C rootdir] [-g] [-z] [-d] -c ... > filename.tar\n",
15+- printf(" %s [-C rootdir] -c filename.tar ...\n",
16++ printf(" %s [-C rootdir] [-d] -c ... > filename.tar\n",
17 progname);
18 exit(-1);
19 }

Subscribers

People subscribed via source and target branches