From: Shuah Khan <skhan@linuxfoundation.org>
To: mchehab+samsung@kernel.org, corbet@lwn.net, rfontana@redhat.com,
kstewart@linuxfoundation.org, gregkh@linuxfoundation.org,
tglx@linutronix.de, bhelgaas@google.com, rppt@linux.ibm.com
Cc: Shuah Khan <skhan@linuxfoundation.org>, linux-kernel@vger.kernel.org
Subject: [PATCH v2] scripts/sphinx-pre-install: add how to exit virtualenv usage message
Date: Wed, 18 Sep 2019 18:37:54 -0600 [thread overview]
Message-ID: <20190919003754.4311-1-skhan@linuxfoundation.org> (raw)
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
next reply other threads:[~2019-09-19 0:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 0:37 Shuah Khan [this message]
2019-10-01 12:54 ` [PATCH v2] scripts/sphinx-pre-install: add how to exit virtualenv usage message Jonathan Corbet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190919003754.4311-1-skhan@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=kstewart@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=rfontana@redhat.com \
--cc=rppt@linux.ibm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).