Avoid exiting on error in an included files (#95)

moul · Oct 23, 2015 · 428df35 · 428df35
1 parent f8349f5
commit 428df35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -255,7 +255,7 @@ Get a released version on: https://github.com/moul/advanced-ssh-config/releases
 
 ### master (unreleased)
 
-* No entry
+* Avoid exiting when an included file contains errors ([#95](https://github.com/moul/advanced-ssh-config/issues/95))
 
 [Full commits list](https://github.com/moul/advanced-ssh-config/compare/v2.1.0...master)
 

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -257,8 +257,7 @@ func (c *Config) LoadFile(filename string) error {
 
 	// Handling includes
 	for _, include := range c.Includes {
-		err = c.LoadFiles(include)
-		if err != nil {
+		if err = c.LoadFiles(include); err != nil {
 			return err
 		}
 	}
@@ -282,9 +281,8 @@ func (c *Config) LoadFiles(pattern string) error {
 
 	// Load files iteratively
 	for _, filepath := range filepaths {
-		err := c.LoadFile(filepath)
-		if err != nil {
-			return err
+		if err := c.LoadFile(filepath); err != nil {
+			Logger.Warnf("Cannot include %q: %v", filepath, err)
 		}
 	}