fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sourceignore: return err of nested load 

Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals 2021-11-23 09:09:59 +01:00
parent 16d4a4899b
commit 9c1c8149a5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/sourceignore/sourceignore.go
View File

@ -100,7 +100,7 @@ func ReadIgnoreFile(path string, domain []string) ([]gitignore.Pattern, error) {
return ps, nil return ps, nil
} }
// LoadIgnorePatterns recursively loads the the IgnoreFile patterns found // LoadIgnorePatterns recursively loads the IgnoreFile patterns found
// in the directory. // in the directory.
func LoadIgnorePatterns(dir string, domain []string) ([]gitignore.Pattern, error) { func LoadIgnorePatterns(dir string, domain []string) ([]gitignore.Pattern, error) {
ps, err := ReadIgnoreFile(filepath.Join(dir, IgnoreFile), domain) ps, err := ReadIgnoreFile(filepath.Join(dir, IgnoreFile), domain)
@ -114,7 +114,9 @@ func LoadIgnorePatterns(dir string, domain []string) ([]gitignore.Pattern, error
for _, fi := range fis { for _, fi := range fis {
if fi.IsDir() && fi.Name() != ".git" { if fi.IsDir() && fi.Name() != ".git" {
var subps []gitignore.Pattern var subps []gitignore.Pattern
subps, err = LoadIgnorePatterns(filepath.Join(dir, fi.Name()), append(domain, fi.Name())) if subps, err = LoadIgnorePatterns(filepath.Join(dir, fi.Name()), append(domain, fi.Name())); err != nil {
return nil, err
}
if len(subps) > 0 { if len(subps) > 0 {
ps = append(ps, subps...) ps = append(ps, subps...)
} }