enable storage always

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 62e4bce5e10f9693e9ce7cb13faba5c0ec67434b..022a686e237b401e01d855958e45de4ce02b810e 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -73,7 +73,6 @@ namespace zypp
       MIL << "Targets closed" << endl;
     }
 
       MIL << "Targets closed" << endl;
     }
 

-#ifndef STORAGE_DISABLED

     bool TargetImpl::isStorageEnabled() const
     {
       return _storage.isInitialized();
     bool TargetImpl::isStorageEnabled() const
     {
       return _storage.isInitialized();


@@ -85,7 +84,6 @@ namespace zypp
       
       _storage.init(root_r);
     }
       
       _storage.init(root_r);
     }

-#endif

   
     const ResStore & TargetImpl::resolvables()
     {
   
     const ResStore & TargetImpl::resolvables()
     {


@@ -99,7 +97,6 @@ namespace zypp
         _store.insert(*it);
       }
 
         _store.insert(*it);
       }
 

-#ifndef STORAGE_DISABLED

       if ( isStorageEnabled() )
       {
         // resolvables stored in the zypp storage database
       if ( isStorageEnabled() )
       {
         // resolvables stored in the zypp storage database


@@ -115,7 +112,6 @@ namespace zypp
       {
         WAR << "storage target not enabled" << std::endl;
       }
       {
         WAR << "storage target not enabled" << std::endl;
       }

-#endif

 
       return _store;
     }
 
       return _store;
     }


@@ -274,7 +270,6 @@ namespace zypp
             it->status().setStatus( ResStatus::uninstalled );
           }
         }
             it->status().setStatus( ResStatus::uninstalled );
           }
         }

-#ifndef STORAGE_DISABLED

         else // other resolvables
         {
           if ( isStorageEnabled() )
         else // other resolvables
         {
           if ( isStorageEnabled() )


@@ -317,7 +312,6 @@ namespace zypp
             WAR << "storage target disabled" << std::endl;
           }
         }
             WAR << "storage target disabled" << std::endl;
           }
         }

-    #endif

       }   
       return remaining;
     }
       }   
       return remaining;
     }

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index 5988f24010b1d49946398a549f4557ecefe11563..edb035105b6547465e14355e220a00e2b2d3f404 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -26,8 +26,6 @@
 #include "zypp/target/store/PersistentStorage.h"
 #include "zypp/solver/detail/Types.h"
 
 #include "zypp/target/store/PersistentStorage.h"
 #include "zypp/solver/detail/Types.h"
 

-#define STORAGE_DISABLED
-

 ///////////////////////////////////////////////////////////////////
 namespace zypp
 { /////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 { /////////////////////////////////////////////////////////////////


@@ -77,11 +75,9 @@ namespace zypp
          media > 0 means limit commits to this media */
       void commit( ResPool pool_r, unsigned int medianr, PoolItemList & errors_r, PoolItemList & remaining_r, PoolItemList & srcremaining_r );
 
          media > 0 means limit commits to this media */
       void commit( ResPool pool_r, unsigned int medianr, PoolItemList & errors_r, PoolItemList & remaining_r, PoolItemList & srcremaining_r );
 

-#ifndef STORAGE_DISABLED

       /** enables the storage target */
       bool isStorageEnabled() const;
       void enableStorage(const Pathname &root_r);
       /** enables the storage target */
       bool isStorageEnabled() const;
       void enableStorage(const Pathname &root_r);

-#endif

 
       /** Commit ordered changes
          return uncommitted ones (due to error) */
 
       /** Commit ordered changes
          return uncommitted ones (due to error) */

diff --git a/zypp/target/store/PersistentStorage.cc b/zypp/target/store/PersistentStorage.cc
index 6cd792d86a84bac811dc9a95c08d27fdbb7cc83a..7748be1516ff46995e4b6668f5e5245e03c329b8 100644 (file)
--- a/zypp/target/store/PersistentStorage.cc
+++ b/zypp/target/store/PersistentStorage.cc
@@ -58,7 +58,7 @@ void PersistentStorage::init(const Pathname &root)
   d->backend = new XMLFilesBackend(root);
 }
 
   d->backend = new XMLFilesBackend(root);
 }
 

-bool PersistentStorage::isInitalized()
+bool PersistentStorage::isInitialized() const

 {
   return ! (d->backend == 0L);
 }
 {
   return ! (d->backend == 0L);
 }

diff --git a/zypp/target/store/PersistentStorage.h b/zypp/target/store/PersistentStorage.h
index 228bbc310cc63cd0660b4d65c8fa6320475076e2..6d87e585ea2ff9e20237cd9a66d2b4fd4845aed8 100644 (file)
--- a/zypp/target/store/PersistentStorage.h
+++ b/zypp/target/store/PersistentStorage.h
@@ -69,7 +69,7 @@ namespace zypp
       /**
        * true is backend was already initialized
        */
       /**
        * true is backend was already initialized
        */

-       bool isInitalized();
+       bool isInitialized() const;

 
       /**
        * Stores a Resolvable in the active backend.
 
       /**
        * Stores a Resolvable in the active backend.