From b44c9804578162826a6a31bb3732c132d96b8cbd Mon Sep 17 00:00:00 2001
From: Alex Goodman <wagoodman@gmail.com>
Date: Wed, 24 Oct 2018 22:13:08 -0400
Subject: [PATCH] unaccounted whiteout files should not be fatal
---
filetree/efficiency.go | 6 +++---
image/image.go | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/filetree/efficiency.go b/filetree/efficiency.go
index 3789b89..e383b9d 100644
--- a/filetree/efficiency.go
+++ b/filetree/efficiency.go
@@ -1,6 +1,7 @@
package filetree
import (
+ "fmt"
"github.com/sirupsen/logrus"
"sort"
)
@@ -64,9 +65,8 @@ func Efficiency(trees []*FileTree) (float64, EfficiencySlice) {
stackedTree := StackRange(trees, 0, currentTree-1)
previousTreeNode, err := stackedTree.GetNode(node.Path())
if err != nil {
- logrus.Fatal(err)
- }
- if previousTreeNode.Data.FileInfo.TarHeader.FileInfo().IsDir() {
+ logrus.Debug(fmt.Sprintf("CurrentTree: %d : %s", currentTree, err))
+ } else if previousTreeNode.Data.FileInfo.TarHeader.FileInfo().IsDir() {
previousTreeNode.VisitDepthChildFirst(sizer, nil)
}
diff --git a/image/image.go b/image/image.go
index 4bb91b5..35e8af1 100644
--- a/image/image.go
+++ b/image/image.go
@@ -215,7 +215,7 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree, float64, fi
imageTarPath, tmpDir := saveImage(imageID)
// fmt.Println(imageTarPath)
// fmt.Println(tmpDir)
- // imageTarPath := "/home/wagoodman/Downloads/image/image.tar"
+ // imageTarPath := "/tmp/dive280665036/image.tar"
defer os.RemoveAll(tmpDir)
// read through the image contents and build a tree