summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2003-05-06 23:11:46 +0000
committerjbj <devnull@localhost>2003-05-06 23:11:46 +0000
commitdb263d446b72a55d69f357c83c1efd80c20d8225 (patch)
tree26952ec81f44239aa10f6700dcd5999cae826a41
parent5f26a13065d64ede572b33f00349af041309e74a (diff)
downloadlibrpm-tizen-db263d446b72a55d69f357c83c1efd80c20d8225.tar.gz
librpm-tizen-db263d446b72a55d69f357c83c1efd80c20d8225.tar.bz2
librpm-tizen-db263d446b72a55d69f357c83c1efd80c20d8225.zip
- fix: cut-n-paste error setting nopromote for Conflicts: (#81965).
CVS patchset: 6822 CVS date: 2003/05/06 23:11:46
-rw-r--r--CHANGES1
-rw-r--r--lib/depends.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index d807f30cd..e91f64468 100644
--- 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 fcfe15bff..a784d32df 100644
--- 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);