From 17f257a938818ecfae3a8c5e4435c7db15398ee0 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Fri, 29 May 2015 19:38:56 -0700 Subject: [PATCH] Allow .dockerignore to ignore everything Change CLI error msg because it was too specific and didn't make sense when there were errors not related to inaccessible files. Removed some log.Error() calls since they're not really errors we should log. Returning the error will be enough. Closes: #13417 Signed-off-by: Doug Davis --- fileutils/fileutils.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fileutils/fileutils.go b/fileutils/fileutils.go index fdafb53..633fbef 100644 --- a/fileutils/fileutils.go +++ b/fileutils/fileutils.go @@ -40,7 +40,6 @@ func CleanPatterns(patterns []string) ([]string, [][]string, bool, error) { } if Exclusion(pattern) { if len(pattern) == 1 { - logrus.Errorf("Illegal exclusion pattern: %s", pattern) return nil, nil, false, errors.New("Illegal exclusion pattern: !") } exceptions = true @@ -94,7 +93,6 @@ func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool, match, err := filepath.Match(pattern, file) if err != nil { - logrus.Errorf("Error matching: %s (pattern: %s)", file, pattern) return false, err } @@ -114,6 +112,7 @@ func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool, if matched { logrus.Debugf("Skipping excluded path: %s", file) } + return matched, nil }