From b8f90f10cbb592d7ac15dccae503767f262cd719 Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 27 Oct 2000 21:45:14 +0000 Subject: [PATCH] - fix: runTriggers was not adding countCorrection. CVS patchset: 4229 CVS date: 2000/10/27 21:45:14 --- CHANGES | 1 + lib/uninstall.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ce83349..0c7d8ac 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,7 @@ - check available inodes as well as blocks on mounted file systems. - pass rpmTransactionSet, not elements, to installBinaryPackage et al. - verify MD5 sums of payload files when unpacking archive. + - fix: runTriggers was not adding countCorrection. 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/lib/uninstall.c b/lib/uninstall.c index caf1609..23c917a 100644 --- a/lib/uninstall.c +++ b/lib/uninstall.c @@ -12,6 +12,8 @@ #include "install.h" #include "misc.h" /* XXX for makeTempFile, doputenv */ +/*@access Header@*/ /* XXX compared with NULL */ + static char * SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"; #define SUFFIX_RPMSAVE ".rpmsave" @@ -558,7 +560,7 @@ int runTriggers(const rpmTransactionSet ts, int sense, Header h, headerNVR(h, &name, NULL, NULL); - numPackage = rpmdbCountPackages(ts->rpmdb, name); + numPackage = rpmdbCountPackages(ts->rpmdb, name) + countCorrection; if (numPackage < 0) return 1; -- 2.7.4