From 05409889464a4727ba4778350a31357fa584ea32 Mon Sep 17 00:00:00 2001 From: Stanislav Visnovsky Date: Wed, 7 Jun 2006 11:59:28 +0000 Subject: [PATCH] really sync the keys --- package/libzypp.changes | 9 ++++----- zypp/target/rpm/RpmDb.cc | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index c056f9d..601c636 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,10 +1,9 @@ ------------------------------------------------------------------- -Wed Jun 7 11:40:46 CEST 2006 - mt@suse.de +Wed Jun 7 13:55:23 CEST 2006 - visnov@suse.cz -- Changed to just prefer DVD drives in "dvd:" scheme, instead of - filter out the non-DVD drives completely. Allows a fallback to - drives without the dvd HAL property e.g. in VMWare. (#177457) -- rev 3530 +- Synchronize keys with rpm database before + closing access to it (#182338) +- rev 3533 ------------------------------------------------------------------- Wed Jun 7 01:00:05 CEST 2006 - dmacvicar@suse.de diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc index c489930..765bf3d 100644 --- a/zypp/target/rpm/RpmDb.cc +++ b/zypp/target/rpm/RpmDb.cc @@ -472,16 +472,16 @@ void RpmDb::initDatabase( Pathname root_r, Pathname dbPath_r ) } #endif + MIL << "Syncronizing keys with zypp keyring" << std::endl; + importZyppKeyRingTrustedKeys(); + exportTrustedKeysInZyppKeyRing(); + // Close the database in case any write acces (create/convert) // happened during init. This should drop any lock acquired // by librpm. On demand it will be reopened readonly and should // not hold any lock. librpmDb::dbRelease( true ); - MIL << "Syncronizing keys with zypp keyring" << std::endl; - importZyppKeyRingTrustedKeys(); - exportTrustedKeysInZyppKeyRing(); - MIL << "InitDatabase: " << *this << endl; } -- 2.7.4