@@ -56,6 +56,7 @@ import org.ossreviewtoolkit.plugins.api.OrtPlugin
5656import org.ossreviewtoolkit.plugins.api.OrtPluginOption
5757import org.ossreviewtoolkit.plugins.api.PluginDescriptor
5858import org.ossreviewtoolkit.utils.common.CommandLineTool
59+ import org.ossreviewtoolkit.utils.common.ProcessCapture
5960import org.ossreviewtoolkit.utils.common.masked
6061import org.ossreviewtoolkit.utils.common.safeDeleteRecursively
6162import org.ossreviewtoolkit.utils.common.stashDirectories
@@ -68,7 +69,7 @@ import org.semver4j.RangesList
6869import org.semver4j.RangesListFactory
6970
7071internal class ConanCommand (private val useConan2 : Boolean = false ) : CommandLineTool {
71- override fun command (workingDir : File ? ) = if (useConan2) " conan2 " else " conan"
72+ override fun command (workingDir : File ? ) = " conan"
7273
7374 override fun transformVersion (output : String ) =
7475 // Conan could report version strings like:
@@ -77,8 +78,15 @@ internal class ConanCommand(private val useConan2: Boolean = false) : CommandLin
7778
7879 override fun getVersionRequirement (): RangesList = RangesListFactory .create(" >=1.44.0 <3.0" )
7980
80- override fun run (vararg args : CharSequence , workingDir : File ? , environment : Map <String , String >) =
81- super .run (args = args, workingDir, environment + mapOf (" CONAN_NON_INTERACTIVE" to " 1" , " CONAN_SERIES" to " 1" ))
81+ override fun run (vararg args : CharSequence , workingDir : File ? , environment : Map <String , String >): ProcessCapture =
82+ super .run (
83+ args = args,
84+ workingDir,
85+ environment + mapOf (
86+ " CONAN_NON_INTERACTIVE" to " 1" ,
87+ " CONAN_SERIES" to if (useConan2) " 2" else " 1"
88+ )
89+ )
8290}
8391
8492data class ConanConfig (
0 commit comments