[Python-checkins] bro-33614: Override exit code in find_msbuild.bat (GH-7169)

Mon May 28 18:39:28 EDT 2018

https://github.com/python/cpython/commit/6025451d6fbebdb998b65705ccf0ead5d4355a75
commit: 6025451d6fbebdb998b65705ccf0ead5d4355a75
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年05月28日T15:39:25-07:00
summary:
bro-33614: Override exit code in find_msbuild.bat (GH-7169)
(cherry picked from commit f9b364fe51ac083e3e423b1e2cefe0e1ad7d9a60)
Co-authored-by: Steve Dower <steve.dower at microsoft.com>
files:
M PCbuild/find_msbuild.bat
M PCbuild/python3dll.vcxproj

diff --git a/PCbuild/find_msbuild.bat b/PCbuild/find_msbuild.bat
index 24f5e2fb5d46..57512a01927e 100644
--- a/PCbuild/find_msbuild.bat
+++ b/PCbuild/find_msbuild.bat
@@ -57,3 +57,4 @@
 @if not defined MSBUILD @echo Failed to find MSBuild
 @set _Py_MSBuild_Source=
 @if not defined MSBUILD @exit /b 1
+ at exit /b 0
diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj
index 0ef7780248fb..d2a9cae5d917 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
