From cb8d38fd9cbfc3c83efffba3fc2587378e9f7476 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Tue, 16 Jul 2019 03:24:42 +0300
Subject: Provisioning: don't re-run Conan 5 times if there is no error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 coin/provisioning/common/windows/03-conan.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1
index 74c21e20..0e9b9bc2 100644
--- a/coin/provisioning/common/windows/03-conan.ps1
+++ b/coin/provisioning/common/windows/03-conan.ps1
@@ -42,7 +42,7 @@ function Run-Conan-Install
                 Push-Location $outpwd
                 Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", `
                     '-s', ('compiler="' + $Compiler + '"'), `
-                    "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" `
+                    "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs"
                 break;
             } catch {
                 if ($i -eq 5) {
-- 
cgit v1.2.3