RpmDb: Export all keys to the zypp trusted keyring in one go.

diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc
index a6e33da..a39ccde 100644 (file)
--- a/zypp/target/rpm/RpmDb.cc
+++ b/zypp/target/rpm/RpmDb.cc
@@ -858,55 +858,45 @@ void RpmDb::importZyppKeyRingTrustedKeys()
 void RpmDb::exportTrustedKeysInZyppKeyRing()
 {
   MIL << "Exporting rpm keyring into zypp trusted keyring" <<endl;
+  librpmDb::db_const_iterator keepDbOpen; // just to keep a ref.
 
   set<Edition>    rpm_keys( pubkeyEditions() );
   list<PublicKey> zypp_keys( getZYpp()->keyRing()->trustedPublicKeys() );
 
-  for_( it, rpm_keys.begin(), rpm_keys.end() )
+  // Temporarily disconnect to prevent the attemt to re-import the exported keys.
+  callback::TempConnect<KeyRingSignals> tempDisconnect;
+
+  TmpFile tmpfile( getZYpp()->tmpPath() );
   {
-    // search the zypp key into the rpm keys
-    // long id is edition version + release
-    string id = str::toUpper( (*it).version() + (*it).release());
-    list<PublicKey>::iterator ik( find( zypp_keys.begin(), zypp_keys.end(), id) );
-    if ( ik != zypp_keys.end() )
-    {
-      MIL << "Key " << (*it) << " is already in zypp database." << endl;
-    }
-    else
+    ofstream tmpos( tmpfile.path().c_str() );
+    for_( it, rpm_keys.begin(), rpm_keys.end() )
     {
-      // we export the rpm key into a file
-      RpmHeader::constPtr result( new RpmHeader() );
-      getData( string("gpg-pubkey"), *it, result );
-      TmpFile file(getZYpp()->tmpPath());
-      ofstream os;
-      try
+      // search the zypp key into the rpm keys
+      // long id is edition version + release
+      string id = str::toUpper( (*it).version() + (*it).release());
+      list<PublicKey>::iterator ik( find( zypp_keys.begin(), zypp_keys.end(), id) );
+      if ( ik != zypp_keys.end() )
       {
-        os.open(file.path().asString().c_str());
-        // dump rpm key into the tmp file
-        os << result->tag_description();
-        //MIL << "-----------------------------------------------" << endl;
-        //MIL << result->tag_description() <<endl;
-        //MIL << "-----------------------------------------------" << endl;
-        os.close();
+       MIL << "Key " << (*it) << " is already in zypp database." << endl;
       }
-      catch (exception &e)
-      {
-        ERR << "Could not dump key " << (*it) << " in tmp file " << file.path() << endl;
-        // just ignore the key
-      }
-
-      // now import the key in zypp
-      try
-      {
-        getZYpp()->keyRing()->importKey( PublicKey(file), true /*trusted*/);
-        MIL << "Trusted key " << (*it) << " imported in zypp keyring." << endl;
-      }
-      catch (Exception &e)
+      else
       {
-        ERR << "Could not import key " << (*it) << " in zypp keyring" << endl;
+       // we export the rpm key into a file
+       RpmHeader::constPtr result( new RpmHeader() );
+       getData( string("gpg-pubkey"), *it, result );
+       MIL <<  "Will export trusted key " << (*it) << " to zypp keyring." << endl;
+       tmpos << result->tag_description() << endl;
       }
     }
   }
+  try
+  {
+    getZYpp()->keyRing()->multiKeyImport( tmpfile.path(), true /*trusted*/);
+  }
+  catch (Exception &e)
+  {
+    ERR << "Could not import keys into in zypp keyring" << endl;
+  }
 }
 
 ///////////////////////////////////////////////////////////////////