From 482f8cbd92a50ba512e965ad0c59f4d33896486c Mon Sep 17 00:00:00 2001
From: InfiniteTF <infinitekittens@protonmail.com>
Date: Wed, 14 Oct 2020 01:51:36 +0200
Subject: [PATCH] Fix clean and scan bugs (#846)

---
 pkg/image/image.go       | 3 ++-
 pkg/manager/task_scan.go | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/image/image.go b/pkg/image/image.go
index 55e5a4162..85658ae48 100644
--- a/pkg/image/image.go
+++ b/pkg/image/image.go
@@ -45,10 +45,11 @@ func CalculateMD5(path string) (string, error) {
 }
 
 func FileExists(path string) bool {
-	_, err := openSourceImage(path)
+	f, err := openSourceImage(path)
 	if err != nil {
 		return false
 	}
+	defer f.Close()
 
 	return true
 }
diff --git a/pkg/manager/task_scan.go b/pkg/manager/task_scan.go
index de9011209..055e280cc 100644
--- a/pkg/manager/task_scan.go
+++ b/pkg/manager/task_scan.go
@@ -656,6 +656,11 @@ func walkFilesToScan(s *models.StashConfig, f filepath.WalkFunc) error {
 	excludeImg := config.GetImageExcludes()
 
 	return symwalk.Walk(s.Path, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			logger.Warnf("error scanning %s: %s", path, err.Error())
+			return nil
+		}
+
 		if info.IsDir() {
 			return nil
 		}