folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

CVS patchset: 5872
CVS date: 2002/11/16 15:06:17
This commit is contained in:
jbj 2002-11-16 15:06:17 +00:00
parent 362d1ae73f
commit a489262365
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -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.

3
rpm.spec.in
View File

@ -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.

2
rpmqv.c
View File

@ -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"));