diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-03-13 09:29:30 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-03-13 09:29:30 +0200 |
| commit | d91060373663d703457c6e1abf40b495ea372bf2 (patch) | |
| tree | 8d7019fca0af2bce1f4128399ffd528df32df069 /lib/depends.c | |
| parent | 23ad4eee6af0dad922fc193309839c186d8056e5 (diff) | |
| download | rpm-d91060373663d703457c6e1abf40b495ea372bf2.tar.gz rpm-d91060373663d703457c6e1abf40b495ea372bf2.tar.bz2 rpm-d91060373663d703457c6e1abf40b495ea372bf2.zip | |
Unbreak conflicts from commit 1f46534b5444dda77e3a2c757f7c88c5ec93dba0
- only call solve callback on requires, conflicts have satisfied/unsatisfied
status backwards here
Diffstat (limited to 'lib/depends.c')
| -rw-r--r-- | lib/depends.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/depends.c b/lib/depends.c index 3aeab1827..18628aec7 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -436,16 +436,18 @@ retry: } /* - * Search for an unsatisfied dependency. + * Search for an unsatisfied dependency (requires only). */ if (adding && !retrying && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOSUGGEST)) { - xx = rpmtsSolve(ts, dep); - if (xx == 0) - goto exit; - if (xx == -1) { - retrying = 1; - rpmalMakeIndex(tsmem->addedPackages); - goto retry; + if (rpmdsTagN(dep) == RPMTAG_REQUIRENAME) { + xx = rpmtsSolve(ts, dep); + if (xx == 0) + goto exit; + if (xx == -1) { + retrying = 1; + rpmalMakeIndex(tsmem->addedPackages); + goto retry; + } } } |