summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewt <devnull@localhost>1996-10-20 19:31:12 +0000
committerewt <devnull@localhost>1996-10-20 19:31:12 +0000
commit15e8f808216f202fba690e2d83c22d171ef2b40a (patch)
treeb1a8a17a2a223265ae84970fca76c1154acb5851
parent96ece3484c4f934db1a666d46e2fc2b233d2af34 (diff)
downloadrpm-15e8f808216f202fba690e2d83c22d171ef2b40a.tar.gz
rpm-15e8f808216f202fba690e2d83c22d171ef2b40a.tar.bz2
rpm-15e8f808216f202fba690e2d83c22d171ef2b40a.zip
added some comments, rpmdbFindByConflicts()
CVS patchset: 1115 CVS date: 1996/10/20 19:31:12
-rw-r--r--lib/rpmlib.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index a67f21188..3730b0d83 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -204,6 +204,7 @@ int rpmdbFindByGroup(rpmdb db, char * group, dbIndexSet * matches);
int rpmdbFindPackage(rpmdb db, char * name, dbIndexSet * matches);
int rpmdbFindByProvides(rpmdb db, char * filespec, dbIndexSet * matches);
int rpmdbFindByRequiredBy(rpmdb db, char * filespec, dbIndexSet * matches);
+int rpmdbFindByConflicts(rpmdb db, char * filespec, dbIndexSet * matches);
int rpmArchScore(char * arch);
int rpmOsScore(char * arch);
@@ -221,9 +222,11 @@ typedef struct rpmDependencyCheck * rpmDependencies;
struct rpmDependencyConflict {
char * byName, * byVersion, * byRelease;
+ /* these needs fields are misnamed -- they are used for the package
+ which isn't needed as well */
char * needsName, * needsVersion;
int needsFlags;
- void * suggestedPackage;
+ void * suggestedPackage; /* NULL if none */
enum { RPMDEP_SENSE_REQUIRES, RPMDEP_SENSE_CONFLICTS } sense;
} ;