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

Incorrect sense matched. 

CVS patchset: 3101
CVS date: 1999/06/18 14:33:16
This commit is contained in:
jbj 1999-06-18 14:33:16 +00:00
parent c2cef66420
commit 35f20f2ece
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/parseReqs.c
View File

@ -129,7 +129,7 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index)
if (ve > v) {
struct ReqComp *rc;
for (rc = ReqComparisons; rc->token != NULL; rc++) {
if (strncmp(v, rc->token, (ve-v)))
if ((ve-v) != strlen(rc->token) || strncmp(v, rc->token, (ve-v)))
continue;
if (r[0] == '/') {
@ -138,6 +138,7 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index)
spec->lineNum, spec->line);
return RPMERR_BADSPEC;
}
switch(tag) {
case RPMTAG_PROVIDES:
case RPMTAG_OBSOLETES:

13
rpmpopt
View File

@ -3,8 +3,6 @@
# belong in /etc/popt, not here. This file will be replaced
# whenever a new version of RPM is installed.
rpm alias --provides --qf '[%{PROVIDES}\n]'
rpm alias --scripts --qf '\
%|PREIN?{preinstall script\
%|PREINPROG?{ (through %{PREINPROG})}|:\n%{PREIN}\n}:\
@ -33,8 +31,15 @@ rpm alias --setugids -q --qf \
--pipe "(echo 'ch() { chown -- \"$1\" \"$3\";chgrp -- \"$2\" \"$3\"; }';grep -v \(none\))|sh"
rpm alias --requires --qf \
"[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]"
rpm alias --conflicts --qf \
"[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]"
rpm alias --obsoletes --qf '[%{OBSOLETES}\n]'
rpm alias --prereq --qf '[%{PREREQ}\n]'
rpm alias --provides --qf '[%{PROVIDES}\n]'
rpm alias --requires --qf \
"[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]"
rpm alias -R --requires
rpm alias --info --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\