Fix config includes when any pattern has no match

creativeprojects · Feb 27, 2022 · 86eebc9 · 86eebc9
1 parent 83e423e
commit 86eebc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/filesearch/filesearch.go b/filesearch/filesearch.go
@@ -141,6 +141,7 @@ func FindConfigurationIncludes(configFile string, includes []string) ([]string,
 	addFile := func(file string) {
 		file = filepath.FromSlash(filepath.Clean(file))
 		if file != configFile {
+			clog.Tracef("include: %s", file)
 			files = append(files, file)
 		}
 	}
@@ -159,8 +160,10 @@ func FindConfigurationIncludes(configFile string, includes []string) ([]string,
 				for _, match := range matches {
 					addFile(match)
 				}
+			} else if err == nil {
+				clog.Debugf("no match: %s", include)
 			} else {
-				return nil, err
+				return nil, fmt.Errorf("%w: %q", err, include)
 			}
 		}
 	}

diff --git a/filesearch/filesearch_test.go b/filesearch/filesearch_test.go
@@ -312,6 +312,7 @@ func TestFindConfigurationIncludes(t *testing.T) {
 		{[]string{"*inc*." + testID + ".*"}, files[1:]},
 		{[]string{"inc1." + testID + ".conf"}, files[1:2]},
 		{[]string{"inc3." + testID + ".conf", "inc1." + testID + ".conf"}, []string{files[3], files[1]}},
+		{[]string{"inc3." + testID + ".conf", "no-match"}, []string{files[3]}},
 		// Does not include self
 		{[]string{"base." + testID + ".conf"}, []string{}},
 		{files[0:1], []string{}},