generator_lib.py: correctly handle lack of --jinja2-path. Python's list.index() method raises an exception when the item isn't present in the list. Fix this check that was instead expecting a negative index. BUG=dawn:225 Change-Id: I8e67d71ff7384f49533a95d5cbe04da1cf7bb0bc Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11301 Reviewed-by: Kai Ninomiya <kainino@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Kai Ninomiya <kainino@chromium.org>
diff --git a/generator/generator_lib.py b/generator/generator_lib.py index 01c8b91..7307f56 100644 --- a/generator/generator_lib.py +++ b/generator/generator_lib.py
@@ -80,11 +80,15 @@ # NOTE: If this argument appears several times, this only uses the first # value, while argparse would typically keep the last one! kJinja2Path = '--jinja2-path' -jinja2_path_argv_index = sys.argv.index(kJinja2Path) -if jinja2_path_argv_index >= 0: +try: + jinja2_path_argv_index = sys.argv.index(kJinja2Path) # Add parent path for the import to succeed. path = os.path.join(sys.argv[jinja2_path_argv_index + 1], os.pardir) sys.path.insert(1, path) +except ValueError: + # --jinja2-path isn't passed, ignore the exception and just import Jinja2 + # assuming it already is in the Python PATH. + pass import jinja2