From 650071c17e2b54ffabed8b865d5ca103725efc72 Mon Sep 17 00:00:00 2001
From: Stelian Pop <stelian@popies.net>
Date: Thu, 18 Jun 2009 09:42:11 +0000
Subject: [PATCH] Restore does not allow -P and -A at the same time.

---
 CHANGES              | 6 +++++-
 restore/main.c       | 4 ++--
 restore/restore.8.in | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 162db68..4b117b2 100644
--- 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 fecaad5..82bde92 100644
--- 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 08fd82b..b414244 100644
--- 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]
-- 
2.39.2