From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 28 May 2018 22:38:30 +0000 (-0700)
Subject: bro-33614: Override exit code in find_msbuild.bat (GH-7169)
X-Git-Tag: v3.6.6rc1~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=100db0b5841e2e593bcdbf4a31c21c4075268cb5;p=python

bro-33614: Override exit code in find_msbuild.bat (GH-7169)

(cherry picked from commit f9b364fe51ac083e3e423b1e2cefe0e1ad7d9a60)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
---

diff --git a/PCbuild/find_msbuild.bat b/PCbuild/find_msbuild.bat
index 1364a17432..b20fc42125 100644
--- a/PCbuild/find_msbuild.bat
+++ b/PCbuild/find_msbuild.bat
@@ -58,3 +58,4 @@
 @if not defined MSBUILD @echo Failed to find MSBuild
 @set _Py_MSBuild_Source=
 @if not defined MSBUILD @exit /b 1
+@exit /b 0
diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj
index 0ef7780248..d2a9cae5d9 100644
--- a/PCbuild/python3dll.vcxproj
+++ b/PCbuild/python3dll.vcxproj
@@ -142,8 +142,8 @@
       <_Lines Include="@(_Symbols->'%(Symbol)')" />
     </ItemGroup>
     <MakeDir Directories="$(IntDir)" />
-    <Message Text="Updating python3stub.def" Condition="@(_OriginalLines) != @(_Lines)" Importance="high" />
+    <Message Text="Updating python3stub.def" Condition="@(_Lines) != @(_OriginalLines)" Importance="high" />
     <WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true"
-                      Condition="@(_DefLines) != @(_Lines)" />
+                      Condition="@(_Lines) != @(_OriginalLines)" />
   </Target>
 </Project>
\ No newline at end of file