Use libsolv includes and adjust documentation

[platform/upstream/libzypp.git] / zypp / ZConfig.cc

diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index 62c42bc..b68039d 100644 (file)
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -13,7 +13,7 @@ extern "C"
 {
 #include <sys/utsname.h>
 #include <unistd.h>
-#include <satsolver/satversion.h>
+#include <solv/satversion.h>
 }
 #include <iostream>
 #include <fstream>
@@ -256,7 +256,7 @@ namespace zypp
         , download_use_deltarpm        ( true )
         , download_use_deltarpm_always  ( false )
         , download_media_prefer_download( true )
-        , download_max_concurrent_connections( 2 )
+        , download_max_concurrent_connections( 5 )
         , download_min_download_speed  ( 0 )
         , download_max_download_speed  ( 0 )
         , download_max_silent_tries    ( 5 )
@@ -267,7 +267,7 @@ namespace zypp
         , solver_upgradeTestcasesToKeep        ( 2 )
         , solverUpgradeRemoveDroppedPackages( true )
         , apply_locks_file             ( true )
-
+        , pluginsPath                  ( "/usr/lib/zypp/plugins" )
       {
         MIL << "libzypp: " << VERSION << " built " << __DATE__ << " " <<  __TIME__ << endl;
         // override_r has higest prio
@@ -493,6 +493,7 @@ namespace zypp
     Pathname cfg_config_path;
     Pathname cfg_known_repos_path;
     Pathname cfg_known_services_path;
+
     Pathname cfg_vendor_path;
     Pathname locks_file;
 
@@ -533,6 +534,8 @@ namespace zypp
     Pathname history_log_path;
     Pathname credentials_global_dir_path;
     Pathname credentials_global_file_path;
+
+    Option<Pathname> pluginsPath;
   };
   ///////////////////////////////////////////////////////////////////
 
@@ -818,11 +821,12 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////
 
   std::string ZConfig::distroverpkg() const
-  {
-      if ( PathInfo(ZConfig::systemRoot() + "/etc/fedora-release").isExist() )
-          return "fedora-release";
-      return "redhat-release";      
-  }
+  { return "redhat-release"; }
+
+  ///////////////////////////////////////////////////////////////////
+
+  Pathname ZConfig::pluginsPath() const
+  { return _pimpl->pluginsPath.get(); }
 
   ///////////////////////////////////////////////////////////////////
 
@@ -830,9 +834,9 @@ namespace zypp
   {
     str << "libzypp: " << VERSION << " built " << __DATE__ << " " <<  __TIME__ << endl;
 
-    str << "satsolver: " << sat_version;
-    if ( ::strcmp( sat_version, SATSOLVER_VERSION_STRING ) )
-      str << " (built against " << SATSOLVER_VERSION_STRING << ")";
+    str << "libsolv: " << sat_version;
+    if ( ::strcmp( sat_version, LIBSOLV_VERSION_STRING ) )
+      str << " (built against " << LIBSOLV_VERSION_STRING << ")";
     str << endl;
 
     str << "zypp.conf: '" << _pimpl->_parsedZyppConf << "'" << endl;