diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java index 5e74aad066..0cf44e6edd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java @@ -35,9 +35,7 @@ import com.google.devtools.build.lib.repository.ExternalPackageUtil; import com.google.devtools.build.lib.repository.ExternalRuleNotFoundException; import com.google.devtools.build.lib.skyframe.ActionEnvironmentFunction; import com.google.devtools.build.lib.skyframe.FileStateValue.RegularFileStateValue; -import com.google.devtools.build.lib.skyframe.FileSymlinkException; import com.google.devtools.build.lib.skyframe.FileValue; -import com.google.devtools.build.lib.skyframe.InconsistentFilesystemException; import com.google.devtools.build.lib.skyframe.PackageLookupValue; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Type; @@ -218,13 +216,7 @@ public abstract class RepositoryFunction { } SkyKey fileSkyKey = FileValue.key(rootedPath); - FileValue fileValue = - (FileValue) - env.getValueOrThrow( - fileSkyKey, - IOException.class, - FileSymlinkException.class, - InconsistentFilesystemException.class); + FileValue fileValue = (FileValue) env.getValueOrThrow(fileSkyKey, IOException.class); if (fileValue == null || !fileValue.isFile() || fileValue.isSpecialFile()) { return false; @@ -234,10 +226,7 @@ public abstract class RepositoryFunction { } catch (LabelSyntaxException e) { throw new IllegalStateException( "Key " + key + " is not a correct file key (should be in form FILE:label)", e); - } catch (IOException - | FileSymlinkException - | InconsistentFilesystemException - | EvalException e) { + } catch (IOException | EvalException e) { // Consider those exception to be a cause for invalidation return false; } @@ -488,9 +477,8 @@ public abstract class RepositoryFunction { repositoryDirectory, PathFragment.EMPTY_FRAGMENT)); FileValue value; try { - value = (FileValue) env.getValueOrThrow(outputDirectoryKey, IOException.class, - FileSymlinkException.class, InconsistentFilesystemException.class); - } catch (IOException | FileSymlinkException | InconsistentFilesystemException e) { + value = (FileValue) env.getValueOrThrow(outputDirectoryKey, IOException.class); + } catch (IOException e) { throw new RepositoryFunctionException( new IOException("Could not access " + repositoryDirectory + ": " + e.getMessage()), Transience.PERSISTENT); |