fix#19 : fix conan remote add in remaken (crash)

b-com-software-basis · Jan 9, 2023 · 80f14d3 · 80f14d3
1 parent c16f5a4
commit 80f14d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/tools/ConanSystemTool.cpp b/src/tools/ConanSystemTool.cpp
@@ -74,8 +74,8 @@ void ConanSystemTool::addRemoteImpl(const std::string & repositoryUrl)
     if (repoParts.size() < 2) {
         if (m_options.getVerbose()) {
             BOOST_LOG_TRIVIAL(info)<<"Using existing conan remote : " << repositoryUrl << ". Remote Url can be specified with remoteAlias#[remoteUrl[#position]]"<<std::endl;
-            return;
         }
+        return;
     }
     if (repoParts.size() >= 2) {
         repoId = repoParts.at(0);
@@ -102,7 +102,7 @@ void ConanSystemTool::addRemoteImpl(const std::string & repositoryUrl)
         }
     }
 
-    if ( std::find(conanRemoteAliases.begin(), conanRemoteAliases.end(), repoId+":") == conanRemoteAliases.end() &&
+    if ( std::find(conanRemoteAliases.begin(), conanRemoteAliases.end(), repoId) == conanRemoteAliases.end() &&
          std::find(conanRemoteUrls.begin(), conanRemoteUrls.end(), repoParts.at(1)) == conanRemoteUrls.end()) {
         std::cout<<"Adding conan remote "<<repoId << " " << repoParts.at(1) <<" at "<<repoParts.at(2)<<std::endl;
         std::string result = run ("remote","add",options);