- fix: cut-n-paste error setting nopromote for Conflicts: (#81965).

CVS patchset: 6822
CVS date: 2003/05/06 23:11:46

diff --git a/CHANGES b/CHANGES
index d807f30..e91f644 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@
        - permit secondary tag match patterns with RPMQV_ALL.
        - python: missed tuple refcount in IDTXload/IDTXglob.
        - fix: IDTXglob should return REMOVETID sorted headers (#89857).
+       - fix: cut-n-paste error setting nopromote for Conflicts: (#81965).
 
 4.1 -> 4.2:
        - set cachesize without a dbenv, the default is far too small.

diff --git a/lib/depends.c b/lib/depends.c
index fcfe15b..a784d32 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -694,7 +694,7 @@ static int checkPackageSet(rpmts ts, const char * dep,
        requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem);
        (void) rpmdsSetNoPromote(requires, _rpmds_nopromote);
        conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, scareMem);
-       (void) rpmdsSetNoPromote(requires, _rpmds_nopromote);
+       (void) rpmdsSetNoPromote(conflicts, _rpmds_nopromote);
        rc = checkPackageDeps(ts, pkgNEVR, requires, conflicts, dep, 0, adding);
        conflicts = rpmdsFree(conflicts);
        requires = rpmdsFree(requires);