openstack/openstack-doc-tools
Code Issues Proposed changes

Merge "Check that mvn is installed and abort if not"

Browse Source
This commit is contained in:
Jenkins 2014-02-07 09:43:04 +00:00 committed by Gerrit Code Review
commit 4a6ef8deb2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os_doc_tools/doctest.py
View File

@ -668,6 +668,15 @@ def publish_book(publish_path, book):
ignore=shutil.ignore_patterns('*.xml')) ignore=shutil.ignore_patterns('*.xml'))
def ensure_exists(program):
"""Check that program exists, abort if not."""
retcode = subprocess.call("type " + program, shell=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if retcode != 0:
print("Program '%s' does not exist, please install!" % program)
sys.exit(1)
def build_book(book, publish_path): def build_book(book, publish_path):
"""Build book(s) in directory book.""" """Build book(s) in directory book."""
@ -1147,6 +1156,9 @@ def main():
check_deleted_files(doc_path, FILE_EXCEPTIONS, CONF.verbose) check_deleted_files(doc_path, FILE_EXCEPTIONS, CONF.verbose)
if CONF.check_build: if CONF.check_build:
# Some programs are called in subprocesses, make sure that they
# really exist.
ensure_exists("mvn")
read_properties() read_properties()
build_affected_books(doc_path, BOOK_EXCEPTIONS, build_affected_books(doc_path, BOOK_EXCEPTIONS,
FILE_EXCEPTIONS, FILE_EXCEPTIONS,