utils-code/x-motemen.ghq
1
0
Fork 0
mirror of https://github.com/x-motemen/ghq.git synced 2026-09-10 07:26:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore and log inaccessible directories instead of failing

Browse source
This commit is contained in:
Songmu 2019-12-19 01:43:12 +09:00
parent 12413bee1f
commit 6dd4bbbfc1
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd_list_test.go
View file

@ -10,7 +10,6 @@ import (
"testing"
"github.com/urfave/cli"
"golang.org/x/xerrors"
)
func flagSet(name string, flags []cli.Flag) *flag.FlagSet {
@ -224,8 +223,8 @@ func TestDoList_notPermittedRoot(t *testing.T) {
os.Chmod(tmpdir, 0000)
err := newApp().Run([]string{"ghq", "list"})
if !os.IsPermission(xerrors.Unwrap(err)) {
t.Errorf("error should be ErrPermission, but: %#+v", err)
if err != nil {
t.Errorf("error should be nil, but: %+v", err)
}
}

11
local_repository.go
View file

@ -1,6 +1,7 @@
package main
import (
"errors"
"fmt"
"net/url"
"os"
@ -9,8 +10,8 @@ import (
"sync"
"github.com/Songmu/gitconfig"
"github.com/motemen/ghq/logger"
"github.com/saracen/walker"
"golang.org/x/xerrors"
)
// LocalRepository represents local repository
@ -263,7 +264,8 @@ func walkLocalRepositories(vcs string, callback func(*LocalRepository)) error {
}
errCb := walker.WithErrorCallback(func(pathname string, err error) error {
if os.IsPermission(xerrors.Unwrap(err)) {
if os.IsPermission(errors.Unwrap(err)) {
logger.Log("warning", fmt.Sprintf("%s: Permission denied", pathname))
return nil
}
return err
@ -276,10 +278,9 @@ func walkLocalRepositories(vcs string, callback func(*LocalRepository)) error {
continue
}
}
// https://github.com/motemen/ghq/issues/173
// https://github.com/motemen/ghq/issues/187
if fi.Mode()&0444 == 0 {
return os.ErrPermission
logger.Log("warning", fmt.Sprintf("%s: Permission denied", root))
continue
}
if err := walker.Walk(root, walkFn, errCb); err != nil {
return err