diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2012-09-12 20:11:00 +0300 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2012-09-12 20:11:00 +0300 |
commit | b6c794362aa9b3b2552f32bd13775a127febc17d (patch) | |
tree | 6f3186f7a36ebc0cb411466fe35e7d1a18c92567 /lib/transaction.c | |
parent | 2ea2a0961f380d844e4e1541df4f2c05f3b78449 (diff) | |
download | librpm-tizen-b6c794362aa9b3b2552f32bd13775a127febc17d.tar.gz librpm-tizen-b6c794362aa9b3b2552f32bd13775a127febc17d.tar.bz2 librpm-tizen-b6c794362aa9b3b2552f32bd13775a127febc17d.zip |
Whoopsie, unbreak checking of installed dependencies
- The dependency sets created from installed headers during rpmtsCheck()
were using a private pool and thus ids not matching with the ones
in the global pool. Oops. Somehow none of our test-suite cases
caught this, looks like we'll need more tests... Also the safe-guard
assert()'s are in all the wrong places for catching this particular
problem. Doh :)
- There's a chicken-and-egg situation involved: in order to do this,
the global pool needs to be in unfrozen state during rpmtsCheck(),
which was not possible before switching rpmal provides (and files)
to pool ids. Now that it *is* using pool id's, move the freeze-point
to rpmtsPrepare() as the fingerprinting has similar issues with
moving strings.
Diffstat (limited to 'lib/transaction.c')
-rw-r--r-- | lib/transaction.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/transaction.c b/lib/transaction.c index 624077786..affc890d3 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1357,6 +1357,9 @@ static int rpmtsPrepare(rpmts ts) const char *dbhome = NULL; struct stat dbstat; + /* Required for now to lock string pointers in memory */ + rpmstrPoolFreeze(tsmem->pool, 1); + fingerPrintCache fpc = fpCacheCreate(fileCount/2 + 10001); rpmFpHash ht = rpmFpHashCreate(fileCount/2+1, fpHashFunction, fpEqual, NULL, NULL); |