summaryrefslogtreecommitdiff
path: root/build.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2001-05-31 22:31:14 +0000
committerjbj <devnull@localhost>2001-05-31 22:31:14 +0000
commitf5ebe3fb424b215dbd455cabd37f5ea56bd5dbff (patch)
treebd022b76822e483d6133c63c5fa056a750f6b4d9 /build.c
parentf8b347a38aeb9a8c90739f3cd2cd2d5c5e46fcce (diff)
downloadrpm-f5ebe3fb424b215dbd455cabd37f5ea56bd5dbff.tar.gz
rpm-f5ebe3fb424b215dbd455cabd37f5ea56bd5dbff.tar.bz2
rpm-f5ebe3fb424b215dbd455cabd37f5ea56bd5dbff.zip
- return multiple suggested packages (Pawel Kolodziej <pawelk@pld.org.pl>).
- fix: return suggested packages when using Depends cache. CVS patchset: 4823 CVS date: 2001/05/31 22:31:14
Diffstat (limited to 'build.c')
-rw-r--r--build.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.c b/build.c
index 2f920d328..d7ecc095d 100644
--- a/build.c
+++ b/build.c
@@ -22,7 +22,7 @@ static int checkSpec(Header h)
rpmdb db = NULL;
int mode = O_RDONLY;
rpmTransactionSet ts;
- struct rpmDependencyConflict * conflicts;
+ rpmDependencyConflict conflicts;
int numConflicts;
int rc;
@@ -30,7 +30,7 @@ static int checkSpec(Header h)
return 0;
if (rpmdbOpen(rootdir, &db, mode, 0644)) {
- const char *dn;
+ const char * dn;
dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL);
rpmError(RPMERR_OPEN, _("cannot open rpm database in %s\n"), dn);
dn = _free(dn);
@@ -44,7 +44,7 @@ static int checkSpec(Header h)
if (rc == 0 && conflicts) {
rpmMessage(RPMMESS_ERROR, _("failed build dependencies:\n"));
printDepProblems(stderr, conflicts, numConflicts);
- rpmdepFreeConflicts(conflicts, numConflicts);
+ conflicts = rpmdepFreeConflicts(conflicts, numConflicts);
rc = 1;
}