gh-107814: Avoid output from Nuget installation in find_python.bat (G… · python/cpython@1e229e2 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 36.1k
• Star 77.2k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 1e229e2

Browse filesBrowse the repository at this point in the historyBrowse files

maxbachmann

authored

gh-107814: Avoid output from Nuget installation in find_python.bat (GH-107815)

1 parent 326f0ba commit 1e229e2
Copy full SHA for 1e229e2

2 files changed

+7-2Lines changed: 7 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Misc/NEWS.d/next/Build
  • 2023-08-09-17-05-33.gh-issue-107814.c0Oapq.rst
• PCbuild
  • find_python.bat

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Misc/NEWS.d/next/Build/2023-08-09-17-05-33.gh-issue-107814.c0Oapq.rst‎

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ When calling ``find_python.bat`` with ``-q`` it did not properly silence the output of nuget. That is now fixed.

Collapse file

‎PCbuild/find_python.bat‎

Copy file name to clipboardExpand all lines: PCbuild/find_python.bat

+6-2Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -52,7 +52,7 @@
52	52	@if "%_Py_NUGET%"=="" (set _Py_NUGET=%_Py_EXTERNALS_DIR%\nuget.exe)
53	53	@if "%_Py_NUGET_URL%"=="" (set _Py_NUGET_URL=https://aka.ms/nugetclidl)
54	54	@if NOT exist "%_Py_NUGET%" (
55		- @echo Downloading nuget...
	55	+ @if not "%_Py_Quiet%"=="1" @echo Downloading nuget...
56	56	@rem NB: Must use single quotes around NUGET here, NOT double!
57	57	@rem Otherwise, a space in the path would break things
58	58	@rem If it fails, retry with any available copy of Python
@@ -63,7 +63,11 @@
63	63	)
64	64
65	65	@if not "%_Py_Quiet%"=="1" @echo Installing Python via nuget...
66		- @"%_Py_NUGET%" install pythonx86 -ExcludeVersion -OutputDirectory "%_Py_EXTERNALS_DIR%"
	66	+ @if not "%_Py_Quiet%"=="1" (
	67	+ @"%_Py_NUGET%" install pythonx86 -ExcludeVersion -OutputDirectory "%_Py_EXTERNALS_DIR%"
	68	+ ) else (
	69	+ @"%_Py_NUGET%" install pythonx86 -Verbosity quiet -ExcludeVersion -OutputDirectory "%_Py_EXTERNALS_DIR%"
	70	+ )
67	71	@rem Quote it here; it's not quoted later because "py -x.y" wouldn't work
68	72	@if not errorlevel 1 (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") & (set _Py_Python_Source=found on nuget.org) & goto :found
69	73

0 commit comments

Comments

0 (0)