diff --git a/src/Cache.cpp b/src/Cache.cpp index 2a1147f..8cbb82d 100644 --- 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 index dc1f7df..eab7e61 100755 --- 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<<"===> "<