re
/
pkger
forked from mirror/pkger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkger hangs fixes #19

This commit is contained in:
Mark Bates 2019-11-08 11:05:03 -08:00
parent a04b1791e4
commit ac960d47a9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
parser/parser.go
View File

@ -80,23 +80,22 @@ func ParseDir(abs string, mode parser.Mode) ([]*ParsedSource, error) {
if !info.IsDir() { if !info.IsDir() {
return nil, fmt.Errorf("%s is not a directory", abs) return nil, fmt.Errorf("%s is not a directory", abs)
} }
dir := filepath.Dir(abs)
her, err := here.Dir(dir) her, err := here.Dir(abs)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("%w: here.Dir failed %s", err, abs)
} }
pt, err := her.Parse(strings.TrimPrefix(abs, dir)) pt, err := her.Parse(strings.TrimPrefix(abs, filepath.Dir(abs)))
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("%w: here.Parse failed %s", err, abs)
} }
fset := token.NewFileSet() fset := token.NewFileSet()
pkgs, err := parser.ParseDir(fset, abs, nil, 0) pkgs, err := parser.ParseDir(fset, abs, nil, 0)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("%w: ParseDir failed %s", err, abs)
} }
var srcs []*ParsedSource var srcs []*ParsedSource