Merge pull request #2094 from orisano/fix-unwrap-error

dashpole · web-flow · commit 13e3e833a304 · 2018-11-07T12:28:27.000-08:00
fix: unwrap error for os.IsNotExist
diff --git a/container/common/helpers.go b/container/common/helpers.go
@@ -29,6 +29,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/karrick/godirwalk"
+	"github.com/pkg/errors"
 )
 
 func DebugInfo(watches map[string][]string) map[string][]string {
@@ -165,7 +166,7 @@ func listDirectories(dirpath string, parent string, recursive bool, output map[s
 	dirents, err := godirwalk.ReadDirents(dirpath, buf)
 	if err != nil {
 		// Ignore if this hierarchy does not exist.
-		if os.IsNotExist(err) {
+		if os.IsNotExist(errors.Cause(err)) {
 			err = nil
 		}
 		return err

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`
`30`	`30`	`"github.com/golang/glog"`
`31`	`31`	`"github.com/karrick/godirwalk"`
	`32`	`+ "github.com/pkg/errors"`
`32`	`33`	`)`
`33`	`34`
`34`	`35`	`func DebugInfo(watches map[string][]string) map[string][]string {`
`@@ -165,7 +166,7 @@ func listDirectories(dirpath string, parent string, recursive bool, output map[s`
`165`	`166`	`dirents, err := godirwalk.ReadDirents(dirpath, buf)`
`166`	`167`	`if err != nil {`
`167`	`168`	`// Ignore if this hierarchy does not exist.`
`168`		`- if os.IsNotExist(err) {`
	`169`	`+ if os.IsNotExist(errors.Cause(err)) {`
`169`	`170`	`err = nil`
`170`	`171`	`}`
`171`	`172`	`return err`