mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-24 01:09:38 -05:00
scripts: sphinx-pre-install: check for PDF min version later on
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:
parent
ed2133b7b5
commit
5b27d2551c
1 changed files with 10 additions and 5 deletions
|
@ -785,12 +785,13 @@ sub recommend_sphinx_version($)
|
||||||
{
|
{
|
||||||
my $virtualenv_cmd = shift;
|
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.
|
# 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) {
|
if (!$need_sphinx) {
|
||||||
# sphinx-build is present and its version is >= $min_version
|
# sphinx-build is present and its version is >= $min_version
|
||||||
|
@ -837,6 +838,10 @@ sub recommend_sphinx_version($)
|
||||||
printf "\t. $activate_cmd\n";
|
printf "\t. $activate_cmd\n";
|
||||||
deactivate_help();
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue