Restore does not allow -P and -A at the same time.

diff --git a/CHANGES b/CHANGES
index 162db6892481dac6d4fc8f0172b556572e83e892..4b117b26cd620bfb8ffb6c4771023077e20f865c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.298 2009/06/18 09:40:03 stelian Exp $
+$Id: CHANGES,v 1.299 2009/06/18 09:42:11 stelian Exp $
 
 Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 =====================================================================
@@ -66,6 +66,10 @@ Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 15.    Fixed a few spelling errors in the man pages (RedHat bug #489853).
        Thanks to Adam Tkac <atkac@redhat.com> for the patch.
 
+16.    Fixed restore man page and program usage which incorrectly stated
+       that -P and -A were both allowed in the same invocation (RedHat
+       bug #490627). Thanks to Adam Tkac <atkac@redhat.com> for the patch.
+
 Changes between versions 0.4b40 and 0.4b41 (released January 2, 2006)
 =====================================================================
 

diff --git a/restore/main.c b/restore/main.c
index fecaad537787602966fe59f2460e6e62d87c6df3..82bde9295de43424f077745b3f469d5e4ba50013 100644 (file)
--- a/restore/main.c
+++ b/restore/main.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.52 2008/04/17 15:26:46 stelian Exp $";
+       "$Id: main.c,v 1.53 2009/06/18 09:42:12 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -728,7 +728,7 @@ usage(void)
                "\t%s -i [-acd" tseflag "hH" kerbflag "lmMouvVy] [-A file] [-b blocksize] " tsEflag"\n"
                "\t%s    [-f file] [-F script] " qfaflag "[-s fileno]\n"
 #ifdef USE_QFA
-               "\t%s -P file [-acdhH" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
+               "\t%s -P file [-acdhH" kerbflag "lmMuvVy] [-b blocksize]\n"
                "\t%s    [-f file] [-F script] [-s fileno] [-X filelist] [file ...]\n"
 #endif
                "\t%s -r [-cd" tseflag "H" kerbflag "lMuvVy] [-b blocksize] " tsEflag"\n"

diff --git a/restore/restore.8.in b/restore/restore.8.in
index 08fd82bfb4290e5d2ccd23b9a8184d86a7bafcf0..b41424498d0ce97d961c95926d48048399760dc4 100644 (file)
--- a/restore/restore.8.in
+++ b/restore/restore.8.in
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"    $Id: restore.8.in,v 1.34 2009/06/18 09:40:05 stelian Exp $
+.\"    $Id: restore.8.in,v 1.35 2009/06/18 09:42:12 stelian Exp $
 .\"
 .TH RESTORE 8 "version __VERSION__ of __DATE__" BSD "System management commands"
 .SH NAME
@@ -54,7 +54,6 @@ restore \- restore files or file systems from backups made with dump
 .B restore \-P 
 .I file
 [\fB\-acdhHklmMNuvVy\fR]
-[\fB\-A \fIfile\fR]
 [\fB\-b \fIblocksize\fR]
 [\fB\-f \fIfile\fR]
 [\fB\-F \fIscript\fR]