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

removed stdin queries and moved --scripts, --provides to rpmpopt 

CVS patchset: 1382
CVS date: 1997/01/30 19:58:40
This commit is contained in:
ewt 1997-01-30 19:58:40 +00:00
parent 9db020e418
commit b5f1f94bba
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
query.c
View File

@ -49,13 +49,6 @@ static char * defaultQueryFormat =
"Description :\n%{DESCRIPTION}\n";
static char * requiresQueryFormat =
"[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]";
static char * providesQueryFormat = "[%{PROVIDES}\n]";
static char * scriptQueryFormat =
"preinstall script:\n%{RPMTAG_PREIN}\n"
"postinstall script:\n%{RPMTAG_POSTIN}\n"
"preuninstall script:\n%{RPMTAG_PREUN}\n"
"postuninstall script:\n%{RPMTAG_POSTUN}\n"
"verify script:\n%{VERIFYSCRIPT}\n";
static int queryHeader(Header h, char * chptr) {
int count = 0;
@ -368,11 +361,6 @@ static void printHeader(Header h, int queryFlags, char * queryFormat) {
queryHeader(h, queryFormat);
}
if (queryFlags & QUERY_FOR_PROVIDES) {
if (headerIsEntry(h, RPMTAG_PROVIDES))
queryHeader(h, providesQueryFormat);
}
if (queryFlags & QUERY_FOR_REQUIRES) {
if (headerIsEntry(h, RPMTAG_REQUIREFLAGS))
queryHeader(h, requiresQueryFormat);
@ -487,10 +475,6 @@ static void printHeader(Header h, int queryFlags, char * queryFormat) {
if (fileGroupList) free(fileGroupList);
}
}
if (queryFlags & QUERY_FOR_SCRIPTS) {
queryHeader(h, scriptQueryFormat);
}
}
}
@ -645,14 +629,13 @@ int doQuery(char * prefix, enum querysources source, int queryFlags,
struct urlContext context;
int isUrl = 0;
if (source != QUERY_SRPM && source != QUERY_RPM) {
if (source != QUERY_RPM) {
if (rpmdbOpen(prefix, &db, O_RDONLY, 0644)) {
exit(1);
}
}
switch (source) {
case QUERY_SRPM:
case QUERY_RPM:
if (urlIsURL(arg)) {
isUrl = 1;
@ -714,7 +697,6 @@ int doQuery(char * prefix, enum querysources source, int queryFlags,
}
break;
case QUERY_SGROUP:
case QUERY_GROUP:
if (rpmdbFindByGroup(db, arg, &matches)) {
fprintf(stderr, "group %s does not contain any packages\n", arg);
@ -745,7 +727,6 @@ int doQuery(char * prefix, enum querysources source, int queryFlags,
}
break;
case QUERY_SPATH:
case QUERY_PATH:
if (*arg != '/') {
char path[255];
@ -779,7 +760,6 @@ int doQuery(char * prefix, enum querysources source, int queryFlags,
}
break;
case QUERY_SPACKAGE:
case QUERY_PACKAGE:
rc = findPackageByLabel(db, arg, &matches);
if (rc == 1) {
@ -795,7 +775,7 @@ int doQuery(char * prefix, enum querysources source, int queryFlags,
break;
}
if (source != QUERY_SRPM && source != QUERY_RPM) {
if (source != QUERY_RPM) {
rpmdbClose(db);
}

7
query.h
View File

@ -3,9 +3,8 @@
#include <rpmlib.h>
enum querysources { QUERY_PATH, QUERY_PACKAGE, QUERY_ALL, QUERY_SPATH,
QUERY_SPACKAGE, QUERY_RPM, QUERY_SRPM, QUERY_GROUP,
QUERY_SGROUP, QUERY_WHATPROVIDES, QUERY_WHATREQUIRES,
enum querysources { QUERY_PATH, QUERY_PACKAGE, QUERY_ALL, QUERY_RPM,
QUERY_GROUP, QUERY_WHATPROVIDES, QUERY_WHATREQUIRES,
QUERY_DBOFFSET };
#define QUERY_FOR_INFO (1 << 0)
@ -13,9 +12,7 @@ enum querysources { QUERY_PATH, QUERY_PACKAGE, QUERY_ALL, QUERY_SPATH,
#define QUERY_FOR_STATE (1 << 2)
#define QUERY_FOR_DOCS (1 << 3)
#define QUERY_FOR_CONFIG (1 << 4)
#define QUERY_FOR_SCRIPTS (1 << 5)
#define QUERY_FOR_REQUIRES (1 << 6)
#define QUERY_FOR_PROVIDES (1 << 7)
#define QUERY_FOR_DUMPFILES (1 << 8)
int doQuery(char * prefix, enum querysources source, int queryFlags,