korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 12:11:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

scripts: sphinx-pre-install: check for PDF min version later on

Browse Source 
Better to add the PDF note late for venv recommendation.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Link: https://lore.kernel.org/r/8e117aabe6dfa1b1ec92dccd20e801393c977667.1656756450.git.mchehab@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Mauro Carvalho Chehab 2022-07-02 11:11:27 +01:00 committed by Jonathan Corbet
parent ed2133b7b5
commit 5b27d2551c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/sphinx-pre-install
View File

@ -785,12 +785,13 @@ sub recommend_sphinx_version($)
{
my $virtualenv_cmd = shift;
if ($latest_avail_ver lt $min_pdf_version) {
print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n";
}
# Version is OK. Nothing to do.
return if ($cur_version && ($cur_version ge $rec_version));
if ($cur_version && ($cur_version ge $rec_version)) {
if ($cur_version lt $min_pdf_version) {
print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n";
}
return;
};
if (!$need_sphinx) {
# sphinx-build is present and its version is >= $min_version
@ -837,6 +838,10 @@ sub recommend_sphinx_version($)
printf "\t. $activate_cmd\n";
deactivate_help();
if ($latest_avail_ver lt $min_pdf_version) {
print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n";
}
return;
}