Merge pull request #243 from patricearruda/master

Moving the ParseBlueprintsFiles comment in context.go.
This commit is contained in:
Jaewoong Jung 2019-03-08 14:28:58 -08:00 committed by GitHub
commit eaf410fe20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -604,15 +604,6 @@ type fileParseContext struct {
doneVisiting chan struct{}
}
func (c *Context) ParseBlueprintsFiles(rootFile string) (deps []string, errs []error) {
baseDir := filepath.Dir(rootFile)
pathsToParse, err := c.ListModulePaths(baseDir)
if err != nil {
return nil, []error{err}
}
return c.ParseFileList(baseDir, pathsToParse)
}
// ParseBlueprintsFiles parses a set of Blueprints files starting with the file
// at rootFile. When it encounters a Blueprints file with a set of subdirs
// listed it recursively parses any Blueprints files found in those
@ -622,6 +613,15 @@ func (c *Context) ParseBlueprintsFiles(rootFile string) (deps []string, errs []e
// which the future output will depend is returned. This list will include both
// Blueprints file paths as well as directory paths for cases where wildcard
// subdirs are found.
func (c *Context) ParseBlueprintsFiles(rootFile string) (deps []string, errs []error) {
baseDir := filepath.Dir(rootFile)
pathsToParse, err := c.ListModulePaths(baseDir)
if err != nil {
return nil, []error{err}
}
return c.ParseFileList(baseDir, pathsToParse)
}
func (c *Context) ParseFileList(rootDir string, filePaths []string) (deps []string,
errs []error) {