diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2021-01-02 12:42:36 -0500 |
|---|---|---|
| committer | Dave Henderson <dhenderson@gmail.com> | 2021-01-02 12:49:40 -0500 |
| commit | 25042240754ae032f53f2225e2f224cbfe51b2b6 (patch) | |
| tree | 5530b07d4928a483d1d34be3138605f6014b422a /data/datasource_git.go | |
| parent | 09a33cdffa6d0b4e57e12827f7075fb2d6c6a543 (diff) | |
Moving lint config to config file, fixing some issues
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'data/datasource_git.go')
| -rw-r--r-- | data/datasource_git.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/datasource_git.go b/data/datasource_git.go index f4b6670d..d3e79d57 100644 --- a/data/datasource_git.go +++ b/data/datasource_git.go @@ -118,9 +118,9 @@ func (g gitsource) parseGitPath(u *url.URL, args ...string) (out *url.URL, p str } if len(args) > 0 { - argURL, err := g.parseArgURL(args[0]) - if err != nil { - return nil, "", err + argURL, uerr := g.parseArgURL(args[0]) + if uerr != nil { + return nil, "", uerr } repo, argpath := g.parseArgPath(u, argURL.Path) out.Path = path.Join(out.Path, repo) @@ -203,8 +203,8 @@ func (g gitsource) read(fs billy.Filesystem, path string) (string, []byte, error return "", nil, fmt.Errorf("can't stat %s: %w", path, err) } if fi.IsDir() || strings.HasSuffix(path, string(filepath.Separator)) { - out, err := g.readDir(fs, path) - return jsonArrayMimetype, out, err + out, rerr := g.readDir(fs, path) + return jsonArrayMimetype, out, rerr } f, err := fs.OpenFile(path, os.O_RDONLY, 0) |