diff options
author | 2016-08-15 21:54:55 +0000 | |
---|---|---|
committer | 2016-08-16 15:21:17 +0000 | |
commit | 3c0adb26bac6d756fb97e4bcc6d4e5b2cefa5eeb (patch) | |
tree | c77f6438711f4b23d6c528907a81e23dc9e6dc91 /src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java | |
parent | 89125d5ee83f562c309a792a7c56ce24452e61ea (diff) |
Allow Skyframe graph lookups and value retrievals to throw InterruptedException.
The only place we now don't handle InterruptedException is in the action graph created after analysis, since I'm not sure that will be around for that much longer.
--
MOS_MIGRATED_REVID=130327770
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java index 2599cb139d..ff49b2d9b3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppOptions; import com.google.devtools.build.lib.rules.cpp.CrosstoolConfigurationLoader; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig; - import javax.annotation.Nullable; /** @@ -47,7 +46,7 @@ public class PythonConfigurationLoader implements ConfigurationFragmentFactory { @Nullable private CrosstoolConfig.CToolchain getToolchain( ConfigurationEnvironment env, BuildOptions buildOptions, Label crosstoolTop) - throws InvalidConfigurationException { + throws InvalidConfigurationException, InterruptedException { CrosstoolConfigurationLoader.CrosstoolFile file = CrosstoolConfigurationLoader.readCrosstool(env, crosstoolTop); if (file == null) { @@ -59,7 +58,7 @@ public class PythonConfigurationLoader implements ConfigurationFragmentFactory { @Override public PythonConfiguration create(ConfigurationEnvironment env, BuildOptions buildOptions) - throws InvalidConfigurationException { + throws InvalidConfigurationException, InterruptedException { PythonOptions pythonOptions = buildOptions.get(PythonOptions.class); CppConfiguration cppConfiguration = env.getFragment(buildOptions, CppConfiguration.class); if (cppConfiguration == null) { |