|
@@ -523,48 +523,44 @@ func TreeSize(dir string) (size int64, err error) {
|
|
// can be read and returns an error if some files can't be read
|
|
// can be read and returns an error if some files can't be read
|
|
// symlinks which point to non-existing files don't trigger an error
|
|
// symlinks which point to non-existing files don't trigger an error
|
|
func ValidateContextDirectory(srcPath string, excludes []string) error {
|
|
func ValidateContextDirectory(srcPath string, excludes []string) error {
|
|
- var finalError error
|
|
|
|
-
|
|
|
|
- filepath.Walk(filepath.Join(srcPath, "."), func(filePath string, f os.FileInfo, err error) error {
|
|
|
|
|
|
+ return filepath.Walk(filepath.Join(srcPath, "."), func(filePath string, f os.FileInfo, err error) error {
|
|
// skip this directory/file if it's not in the path, it won't get added to the context
|
|
// skip this directory/file if it's not in the path, it won't get added to the context
|
|
- relFilePath, err := filepath.Rel(srcPath, filePath)
|
|
|
|
- if err != nil && os.IsPermission(err) {
|
|
|
|
- return nil
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- skip, err := Matches(relFilePath, excludes)
|
|
|
|
- if err != nil {
|
|
|
|
- finalError = err
|
|
|
|
- }
|
|
|
|
- if skip {
|
|
|
|
|
|
+ if relFilePath, err := filepath.Rel(srcPath, filePath); err != nil {
|
|
|
|
+ return err
|
|
|
|
+ } else if skip, err := Matches(relFilePath, excludes); err != nil {
|
|
|
|
+ return err
|
|
|
|
+ } else if skip {
|
|
if f.IsDir() {
|
|
if f.IsDir() {
|
|
return filepath.SkipDir
|
|
return filepath.SkipDir
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
- if _, err := os.Stat(filePath); err != nil && os.IsPermission(err) {
|
|
|
|
- finalError = fmt.Errorf("can't stat '%s'", filePath)
|
|
|
|
|
|
+ if err != nil {
|
|
|
|
+ if os.IsPermission(err) {
|
|
|
|
+ return fmt.Errorf("can't stat '%s'", filePath)
|
|
|
|
+ }
|
|
|
|
+ if os.IsNotExist(err) {
|
|
|
|
+ return nil
|
|
|
|
+ }
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
|
|
+
|
|
// skip checking if symlinks point to non-existing files, such symlinks can be useful
|
|
// skip checking if symlinks point to non-existing files, such symlinks can be useful
|
|
// also skip named pipes, because they hanging on open
|
|
// also skip named pipes, because they hanging on open
|
|
- lstat, _ := os.Lstat(filePath)
|
|
|
|
- if lstat != nil && lstat.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
|
|
|
|
|
|
+ if f.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
if !f.IsDir() {
|
|
if !f.IsDir() {
|
|
currentFile, err := os.Open(filePath)
|
|
currentFile, err := os.Open(filePath)
|
|
if err != nil && os.IsPermission(err) {
|
|
if err != nil && os.IsPermission(err) {
|
|
- finalError = fmt.Errorf("no permission to read from '%s'", filePath)
|
|
|
|
- return err
|
|
|
|
|
|
+ return fmt.Errorf("no permission to read from '%s'", filePath)
|
|
}
|
|
}
|
|
currentFile.Close()
|
|
currentFile.Close()
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
})
|
|
})
|
|
- return finalError
|
|
|
|
}
|
|
}
|
|
|
|
|
|
func StringsContainsNoCase(slice []string, s string) bool {
|
|
func StringsContainsNoCase(slice []string, s string) bool {
|