summaryrefslogtreecommitdiff
path: root/internal/rtree
diff options
context:
space:
mode:
authorStefan Majewsky <stefan.majewsky@sap.com>2024-07-08 13:24:48 +0200
committerGitHub <noreply@github.com>2024-07-08 13:24:48 +0200
commit6f4c551a522b94e80ace5657d2b8cdfc267d8ae2 (patch)
treedff4e1340747fb48d9fd7e90fa5d106c7b28e622 /internal/rtree
parent36ff2756180fa586796088629b0e98ba4465753c (diff)
parentc94c05373f4bc79361ab2fcdd3516c244bc67312 (diff)
downloadgofu-6f4c551a522b94e80ace5657d2b8cdfc267d8ae2.tar.gz
Merge pull request #14 from SuperSandro2000/fixes
Fix lints reported by gopls
Diffstat (limited to 'internal/rtree')
-rw-r--r--internal/rtree/index.go12
-rw-r--r--internal/rtree/shared_test.go4
2 files changed, 8 insertions, 8 deletions
diff --git a/internal/rtree/index.go b/internal/rtree/index.go
index ac78d90..201d4f9 100644
--- a/internal/rtree/index.go
+++ b/internal/rtree/index.go
@@ -273,8 +273,8 @@ func (i *Index) FindRepo(rawRemoteURL string, allowClone bool) (*Repo, error) {
return nil, err
}
i.Repos = append(i.Repos, &newRepo)
- i.Write()
- return &newRepo, nil
+ err = i.Write()
+ return &newRepo, err
}
//if we found fork candidates, ask the user to match the repo with a fork
@@ -302,8 +302,8 @@ func (i *Index) FindRepo(rawRemoteURL string, allowClone bool) (*Repo, error) {
return nil, err
}
i.Repos = append(i.Repos, &newRepo)
- i.Write()
- return &newRepo, nil
+ err = i.Write()
+ return &newRepo, err
}
//find the repo selected by the user
@@ -346,8 +346,8 @@ func (i *Index) FindRepo(rawRemoteURL string, allowClone bool) (*Repo, error) {
Name: remoteName,
URL: remoteURL,
})
- i.Write()
- return target, nil
+ err = i.Write()
+ return target, err
}
// ImportRepo moves the given repo into the rtree and adds it to the index.
diff --git a/internal/rtree/shared_test.go b/internal/rtree/shared_test.go
index 2869c3c..3bfdaba 100644
--- a/internal/rtree/shared_test.go
+++ b/internal/rtree/shared_test.go
@@ -94,11 +94,11 @@ func (test Test) Run(t *testing.T) {
}
//check output
- output := string(stdout.Bytes())
+ output := stdout.String()
if output != test.ExpectOutput {
t.Errorf("%s: expected stdout %#v, but got %#v", t.Name(), test.ExpectOutput, output)
}
- output = string(stderr.Bytes())
+ output = stderr.String()
if output != test.ExpectError {
t.Errorf("%s: expected stderr %#v, but got %#v", t.Name(), test.ExpectError, output)
}