diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index f8a0a4eaa..d2c6d8901 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -607,6 +607,7 @@ def GetPythonUnitTests(input_api, output_api, unit_tests): if env.get('PYTHONPATH'): backpath.append(env.get('PYTHONPATH')) env['PYTHONPATH'] = input_api.os_path.pathsep.join((backpath)) + env.pop('VPYTHON_CLEAR_PYTHONPATH', None) cmd = [input_api.python_executable, '-m', '%s' % unit_test] results.append(input_api.Command( name=unit_test_name, @@ -732,6 +733,7 @@ def GetPylint(input_api, output_api, white_list=None, black_list=None, import sys env['PYTHONPATH'] = input_api.os_path.pathsep.join( extra_paths_list + sys.path).encode('utf8') + env.pop('VPYTHON_CLEAR_PYTHONPATH', None) def GetPylintCmd(flist, extra, parallel): # Windows needs help running python files so we explicitly specify diff --git a/recipes/trigger_recipe_roller.txt b/recipes/trigger_recipe_roller.txt index ba7623cd9..b2ea5913e 100644 --- a/recipes/trigger_recipe_roller.txt +++ b/recipes/trigger_recipe_roller.txt @@ -1 +1 @@ -No-op file. Edit this to kick recipes. Yep. +No-op file. Edit this to kick recipes.