- fix: option conflict error message (#77373).

CVS patchset: 5872
CVS date: 2002/11/16 15:06:17

diff --git a/CHANGES b/CHANGES
index bd6da7a..d614d44 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@
        - have debug sub-subpackage use external, not internal, elfutils.
        - apply patches 1-6 to db-4.1.24.
        - resurrect availablePackages one more time.
+       - fix: option conflict error message (#77373).
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/rpm.spec.in b/rpm.spec.in
index 29cff71..a10b36f 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -481,6 +481,9 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Sat Nov 16 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.11
+- fix: option conflict error message (#77373).
+
 * Fri Nov 15 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.10
 - update to elfutils-0.56.
 - have debug sub-subpackage use external, not internal, elfutils.

diff --git a/rpmqv.c b/rpmqv.c
index 3b48656..f3e50b0 100755 (executable)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -421,7 +421,7 @@ int main(int argc, const char ** argv)
        argerror(_("files may only be relocated during package installation"));
 
     if (ia->relocations && ia->prefix)
-       argerror(_("only one of --prefix or --relocate may be used"));
+       argerror(_("cannot use --prefix with --relocate or --excludepath"));
 
     if (bigMode != MODE_INSTALL && ia->relocations)
        argerror(_("--relocate and --excludepath may only be used when installing new packages"));