Imported Upstream version 16.0.3

[platform/upstream/libzypp.git] / zypp / sat / detail / PoolImpl.cc

diff --git a/zypp/sat/detail/PoolImpl.cc b/zypp/sat/detail/PoolImpl.cc
index 04db2e1..89936d3 100644 (file)
--- a/zypp/sat/detail/PoolImpl.cc
+++ b/zypp/sat/detail/PoolImpl.cc
@@ -91,6 +91,8 @@ namespace zypp
 
       /////////////////////////////////////////////////////////////////
 
+      const bool resusePoolIDs = true;
+
       const std::string & PoolImpl::systemRepoAlias()
       {
         static const std::string _val( "@System" );
@@ -103,21 +105,20 @@ namespace zypp
        return _val;
       }
 
-
       /////////////////////////////////////////////////////////////////
 
-      static void logSat( struct _Pool *, void *data, int type, const char *logString )
+      static void logSat( CPool *, void *data, int type, const char *logString )
       {
          if ( type & (SOLV_FATAL|SOLV_ERROR) ) {
-           _ERR("libsolv") << logString;
+           L_ERR("libsolv") << logString;
          } else if ( type & SOLV_DEBUG_STATS ) {
-           _DBG("libsolv") << logString;
+           L_DBG("libsolv") << logString;
          } else {
-           _MIL("libsolv") << logString;
+           L_MIL("libsolv") << logString;
          }
       }
 
-      detail::IdType PoolImpl::nsCallback( struct _Pool *, void * data, detail::IdType lhs, detail::IdType rhs )
+      detail::IdType PoolImpl::nsCallback( CPool *, void * data, detail::IdType lhs, detail::IdType rhs )
       {
         // lhs:    the namespace identifier, e.g. NAMESPACE:MODALIAS
         // rhs:    the value, e.g. pci:v0000104Cd0000840[01]sv*sd*bc*sc*i*
@@ -258,9 +259,15 @@ namespace zypp
         ::pool_freewhatprovides( _pool );
       }
 
-
       void PoolImpl::prepare() const
       {
+       // additional /etc/sysconfig/storage check:
+       static WatchFile sysconfigFile( sysconfigStoragePath(), WatchFile::NO_INIT );
+       if ( sysconfigFile.hasChanged() )
+       {
+         _requiredFilesystemsPtr.reset(); // recreated on demand
+         const_cast<PoolImpl*>(this)->depSetDirty( "/etc/sysconfig/storage change" );
+       }
        if ( _watcher.remember( _serial ) )
         {
           // After repo/solvable add/remove:
@@ -281,40 +288,29 @@ namespace zypp
         }
       }
 
-      void PoolImpl::prepareForSolving() const
-      {
-       // additional /etc/sysconfig/storage check:
-       static WatchFile sysconfigFile( sysconfigStoragePath(), WatchFile::NO_INIT );
-       if ( sysconfigFile.hasChanged() )
-       {
-         _requiredFilesystemsPtr.reset(); // recreated on demand
-         const_cast<PoolImpl*>(this)->depSetDirty( "/etc/sysconfig/storage change" );
-       }
-       // finally prepare as usual:
-       prepare();
-      }
-
       ///////////////////////////////////////////////////////////////////
 
-      ::_Repo * PoolImpl::_createRepo( const std::string & name_r )
+      CRepo * PoolImpl::_createRepo( const std::string & name_r )
       {
         setDirty(__FUNCTION__, name_r.c_str() );
-        ::_Repo * ret = ::repo_create( _pool, name_r.c_str() );
+        CRepo * ret = ::repo_create( _pool, name_r.c_str() );
         if ( ret && name_r == systemRepoAlias() )
           ::pool_set_installed( _pool, ret );
         return ret;
       }
 
-      void PoolImpl::_deleteRepo( ::_Repo * repo_r )
+      void PoolImpl::_deleteRepo( CRepo * repo_r )
       {
         setDirty(__FUNCTION__, repo_r->name );
        if ( isSystemRepo( repo_r ) )
          _autoinstalled.clear();
         eraseRepoInfo( repo_r );
-        ::repo_free( repo_r, /*reuseids*/false );
+        ::repo_free( repo_r, resusePoolIDs );
+       if ( resusePoolIDs && !_pool->urepos )  // If the last repo is removed clear the pool to actually reuse all IDs.
+         ::pool_freeallrepos( _pool, resusePoolIDs );
       }
 
-      int PoolImpl::_addSolv( ::_Repo * repo_r, FILE * file_r )
+      int PoolImpl::_addSolv( CRepo * repo_r, FILE * file_r )
       {
         setDirty(__FUNCTION__, repo_r->name );
         int ret = ::repo_add_solv( repo_r, file_r, 0 );
@@ -323,7 +319,7 @@ namespace zypp
         return ret;
       }
 
-      int PoolImpl::_addHelix( ::_Repo * repo_r, FILE * file_r )
+      int PoolImpl::_addHelix( CRepo * repo_r, FILE * file_r )
       {
         setDirty(__FUNCTION__, repo_r->name );
         int ret = ::repo_add_helix( repo_r, file_r, 0 );
@@ -332,7 +328,7 @@ namespace zypp
         return 0;
       }
 
-      void PoolImpl::_postRepoAdd( ::_Repo * repo_r )
+      void PoolImpl::_postRepoAdd( CRepo * repo_r )
       {
         if ( ! isSystemRepo( repo_r ) )
         {
@@ -352,7 +348,7 @@ namespace zypp
           unsigned       blockSize  = 0;
           for ( detail::IdType i = repo_r->start; i < repo_r->end; ++i )
           {
-              ::_Solvable * s( _pool->solvables + i );
+              CSolvable * s( _pool->solvables + i );
               if ( s->repo == repo_r && sysids.find( s->arch ) == sysids.end() )
               {
                 // Remember an unwanted arch entry:
@@ -363,20 +359,20 @@ namespace zypp
               else if ( blockSize )
               {
                 // Free remembered entries
-                  ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false );
+                  ::repo_free_solvable_block( repo_r, blockBegin, blockSize, resusePoolIDs );
                   blockBegin = blockSize = 0;
               }
           }
           if ( blockSize )
           {
               // Free remembered entries
-              ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false );
+              ::repo_free_solvable_block( repo_r, blockBegin, blockSize, resusePoolIDs );
               blockBegin = blockSize = 0;
           }
         }
       }
 
-      detail::SolvableIdType PoolImpl::_addSolvables( ::_Repo * repo_r, unsigned count_r )
+      detail::SolvableIdType PoolImpl::_addSolvables( CRepo * repo_r, unsigned count_r )
       {
         setDirty(__FUNCTION__, repo_r->name );
         return ::repo_add_solvable_block( repo_r, count_r );
@@ -384,7 +380,7 @@ namespace zypp
 
       void PoolImpl::setRepoInfo( RepoIdType id_r, const RepoInfo & info_r )
       {
-        ::_Repo * repo( getRepo( id_r ) );
+        CRepo * repo( getRepo( id_r ) );
         if ( repo )
         {
           bool dirty = false;