From 821d2552048d6e2b0a780c7f5148ddb1b61e5189 Mon Sep 17 00:00:00 2001 From: "Casper S. Jensen" Date: Mon, 15 Mar 2021 16:20:34 +0100 Subject: [PATCH] Revert "Forgive the case when a whiteout file trying to cover nonexistent path (#358)" (#360) This reverts commit 026a5012cc61269dd16d1977988c92bd7301a1a7. --- lib/snapshot/mem_layer.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/snapshot/mem_layer.go b/lib/snapshot/mem_layer.go index 96a14e42..66ea7892 100644 --- a/lib/snapshot/mem_layer.go +++ b/lib/snapshot/mem_layer.go @@ -23,7 +23,6 @@ import ( "sort" "strings" - "github.com/uber/makisu/lib/log" "github.com/uber/makisu/lib/pathutils" "github.com/uber/makisu/lib/tario" ) @@ -115,9 +114,7 @@ func (f *whiteoutMemFile) updateMemFS(node *memFSNode) error { if i != len(parts)-1 { return fmt.Errorf("missing intermediate dir %s in %s", part, f.del) } - // This could happen to files that's cleaned up in the background, like - // python package's .dist-info or .pth file. - log.Warnf("Trying to whiteout nonexistent path: %s", f.del) + return fmt.Errorf("whiteout nonexistent path %s", f.del) } } return nil