fix: #6 - ignore remaken cache for conan dependencies and fix empty l…

…ines in .remaken-cache
b-com-software-basis · Jul 18, 2023 · c9ab7fc · c9ab7fc
2 parents 947be31 + 65439b5
commit c9ab7fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Cache.cpp b/src/Cache.cpp
@@ -62,7 +62,9 @@ void Cache::load() {
             while (!fis.eof()) {
                 string curStr;
                 getline(fis,curStr);
-                m_cachedUrls.push_back(curStr);
+                if (!curStr.empty()) {
+                    m_cachedUrls.push_back(curStr);
+                }
             }
             fis.close();
             m_loaded = true;

diff --git a/src/managers/DependencyManager.cpp b/src/managers/DependencyManager.cpp
@@ -155,7 +155,7 @@ bool DependencyManager::installDep(Dependency &  dependency, const std::string &
         withHeaders = fs::exists(outputDirectory/Constants::PKGINFO_FOLDER/".headers");
     }
 
-    if (dependency.getType() != Dependency::Type::REMAKEN) {
+    if (dependency.getType() != Dependency::Type::REMAKEN && dependency.getType() != Dependency::Type::CONAN) {
         if (m_options.useCache()) {
             if (!m_cache.contains(source)) {
                 return true;
@@ -258,8 +258,10 @@ void DependencyManager::retrieveDependency(Dependency &  dependency, DependencyF
                 }
             }
             std::cout<<"===> "<<dependency.getName()<<" installed in "<<outputDirectory<<std::endl;
-            if (m_options.useCache()) {
-                m_cache.add(source);
+            if (dependency.getType() != Dependency::Type::CONAN) {
+                if (m_options.useCache()) {
+                    m_cache.add(source);
+                }
             }
         }
         catch (const std::runtime_error & e) {