From 88915cec66bc2c12a32107dd16bfb2230b6f77d2 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 31 Jul 2014 15:11:15 -0700 Subject: [PATCH] Return error for utils.Matches in archive Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 8891e912b44c4ff597f7a45658c4d3030d730c98 Component: engine --- components/engine/archive/archive.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/archive/archive.go b/components/engine/archive/archive.go index 6ed7f56554..eea8db364d 100644 --- a/components/engine/archive/archive.go +++ b/components/engine/archive/archive.go @@ -352,8 +352,9 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error) skip, err := utils.Matches(relFilePath, options.Excludes) if err != nil { utils.Debugf("Error matching %s\n", relFilePath, err) - return nil + return err } + if skip { if f.IsDir() { return filepath.SkipDir