@@ -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.alsoIfNull
6061import org.ossreviewtoolkit.utils.common.masked
6162import org.ossreviewtoolkit.utils.common.safeDeleteRecursively
@@ -69,7 +70,7 @@ import org.semver4j.RangesList
6970import org.semver4j.RangesListFactory
7071
7172internal class ConanCommand (private val useConan2 : Boolean = false ) : CommandLineTool {
72- override fun command (workingDir : File ? ) = if (useConan2) " conan2 " else " conan"
73+ override fun command (workingDir : File ? ) = " conan"
7374
7475 override fun transformVersion (output : String ) =
7576 // Conan could report version strings like:
@@ -78,8 +79,15 @@ internal class ConanCommand(private val useConan2: Boolean = false) : CommandLin
7879
7980 override fun getVersionRequirement (): RangesList = RangesListFactory .create(" >=1.44.0 <3.0" )
8081
81- override fun run (vararg args : CharSequence , workingDir : File ? , environment : Map <String , String >) =
82- super .run (args = args, workingDir, environment + mapOf (" CONAN_NON_INTERACTIVE" to " 1" , " CONAN_SERIES" to " 1" ))
82+ override fun run (vararg args : CharSequence , workingDir : File ? , environment : Map <String , String >): ProcessCapture =
83+ super .run (
84+ args = args,
85+ workingDir,
86+ environment + mapOf (
87+ " CONAN_NON_INTERACTIVE" to " 1" ,
88+ " CONAN_SERIES" to if (useConan2) " 2" else " 1"
89+ )
90+ )
8391}
8492
8593data class ConanConfig (
0 commit comments