Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / solver / detail / SystemCheck.cc

diff --git a/zypp/solver/detail/SystemCheck.cc b/zypp/solver/detail/SystemCheck.cc
index c2f9069..cd6da86 100644 (file)
--- a/zypp/solver/detail/SystemCheck.cc
+++ b/zypp/solver/detail/SystemCheck.cc
@@ -13,8 +13,6 @@
 #include <fstream>
 #include <vector>
 
-#define ZYPP_USE_RESOLVER_INTERNALS
-
 #include "zypp/base/LogTools.h"
 #include "zypp/base/IOStream.h"
 #include "zypp/base/String.h"
@@ -32,7 +30,6 @@ namespace zypp
 { /////////////////////////////////////////////////////////////////
 
     Pathname           _file = "";
-    Pathname            _dir = "";
     CapabilitySet      _require;
     CapabilitySet      _conflict;
 
@@ -45,40 +42,24 @@ namespace zypp
     }
 
 
-  SystemCheck::SystemCheck() {
+    SystemCheck::SystemCheck() {
        if (_file.empty()) {
            _file = ZConfig::instance().solver_checkSystemFile();
-           loadFile(_file);
+           loadFile();
        }
-        if (_dir.empty()) {
-          _dir = ZConfig::instance().solver_checkSystemFileDir();
-          loadFiles();
-        }
     }
 
     bool SystemCheck::setFile(const Pathname & file) const{
        MIL << "Setting checkFile to : " << file << endl;
        _file = file;
-       loadFile(_file);
+       loadFile();
        return true;
     }
 
-    bool SystemCheck::setDir(const Pathname & dir) const {
-      MIL << "Setting checkFile directory to : " << dir << endl;
-      loadFile(_file);
-      _dir = dir;
-      loadFiles();
-      return true;
-    }
-
     const Pathname & SystemCheck::file() {
        return _file;
     }
 
-    const Pathname & SystemCheck::dir() {
-       return _dir;
-    }
-
     const CapabilitySet & SystemCheck::requiredSystemCap() const{
        return _require;
     }
@@ -87,23 +68,21 @@ namespace zypp
        return _conflict;
     }
 
-    bool SystemCheck::loadFile(Pathname & file, bool reset_caps) const{
+    bool SystemCheck::loadFile() const{
         Target_Ptr trg( getZYpp()->getTarget() );
         if ( trg )
-          file = trg->assertRootPrefix( file );
+          _file = trg->assertRootPrefix( _file );
 
-       PathInfo pi( file );
+       PathInfo pi( _file );
        if ( ! pi.isFile() ) {
-           WAR << "Can't read " << file << " " << pi << endl;
+           WAR << "Can't read " << _file << " " << pi << endl;
            return false;
        }
 
-        if (reset_caps) {
-          _require.clear();
-          _conflict.clear();
-        }
+       _require.clear();
+       _conflict.clear();
 
-       std::ifstream infile( file.c_str() );
+       std::ifstream infile( _file.c_str() );
        for( iostr::EachLine in( infile ); in; in.next() ) {
            std::string l( str::trim(*in) );
            if ( ! l.empty() && l[0] != '#' )
@@ -128,25 +107,6 @@ namespace zypp
        return true;
     }
 
-  bool SystemCheck::loadFiles() const {
-
-    filesystem::dirForEach(_dir,
-                           [this](const Pathname & dir_r, const char *const & name_r)->bool
-                           {
-                             const std::string wanted = ".check";
-                             Pathname pth = dir_r/name_r;
-                             if (pth.extension() != wanted) {
-                               MIL << "Skipping " << pth << " (not a *.check file)" << endl;
-                               return true;
-                             }
-                             else {
-                               MIL << "Reading " << pth << endl;
-                               return loadFile(pth, false /* do not reset caps */);
-                             }
-                           });
-    return true;
-  }
-
 
     /******************************************************************
     **