* [PATCH v2] scripts/sphinx-pre-install: add how to exit virtualenv usage message
@ 2019-09-19 0:37 Shuah Khan
2019-10-01 12:54 ` Jonathan Corbet
0 siblings, 1 reply; 2+ messages in thread
From: Shuah Khan @ 2019-09-19 0:37 UTC (permalink / raw)
To: mchehab+samsung, corbet, rfontana, kstewart, gregkh, tglx,
bhelgaas, rppt
Cc: Shuah Khan, linux-kernel
Add usage message on how to exit the virtualenv after documentation
work is done.
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
---
Changes since v1:
Changed the message based on Mauro's review comments.
scripts/sphinx-pre-install | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 3b638c0e1a4f..013099cd120d 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -645,6 +645,12 @@ sub check_distros()
# Common dependencies
#
+sub deactivate_help()
+{
+ printf "\tIf you want to exit the virtualenv, you can use:\n";
+ printf "\tdeactivate\n";
+}
+
sub check_needs()
{
# Check for needed programs/tools
@@ -686,6 +692,7 @@ sub check_needs()
if ($need_sphinx && scalar @activates > 0 && $activates[0] ge $min_activate) {
printf "\nNeed to activate a compatible Sphinx version on virtualenv with:\n";
printf "\t. $activates[0]\n";
+ deactivate_help();
exit (1);
} else {
my $rec_activate = "$virtenv_dir/bin/activate";
@@ -697,6 +704,7 @@ sub check_needs()
printf "\t$virtualenv $virtenv_dir\n";
printf "\t. $rec_activate\n";
printf "\tpip install -r $requirement_file\n";
+ deactivate_help();
$need++ if (!$rec_sphinx_upgrade);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] scripts/sphinx-pre-install: add how to exit virtualenv usage message
2019-09-19 0:37 [PATCH v2] scripts/sphinx-pre-install: add how to exit virtualenv usage message Shuah Khan
@ 2019-10-01 12:54 ` Jonathan Corbet
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Corbet @ 2019-10-01 12:54 UTC (permalink / raw)
To: Shuah Khan
Cc: mchehab+samsung, rfontana, kstewart, gregkh, tglx, bhelgaas,
rppt, linux-kernel
On Wed, 18 Sep 2019 18:37:54 -0600
Shuah Khan <skhan@linuxfoundation.org> wrote:
> Add usage message on how to exit the virtualenv after documentation
> work is done.
>
> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
> ---
> Changes since v1:
> Changed the message based on Mauro's review comments.
Applied, thanks.
jon
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-01 12:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-19 0:37 [PATCH v2] scripts/sphinx-pre-install: add how to exit virtualenv usage message Shuah Khan
2019-10-01 12:54 ` Jonathan Corbet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).