Merge pull request #634 from davecheney/fixedbugs/632

internal/fs: IsRegular returns an error on any non regular file

Author: sdboyer

internal/fs/fs.go

@@ -374,16 +374,16 @@ func IsNonEmptyDir(name string) (bool, error) {
 
 // IsRegular determines if the path given is a regular file or not.
 func IsRegular(name string) (bool, error) {
-	// TODO: lstat?
 	fi, err := os.Stat(name)
 	if os.IsNotExist(err) {
 		return false, nil
 	}
 	if err != nil {
 		return false, err
 	}
-	if fi.IsDir() {
-		return false, errors.Errorf("%q is a directory, should be a file", name)
+	mode := fi.Mode()
+	if mode&os.ModeType != 0 {
+		return false, errors.Errorf("%q is a %v, expected a file", name, mode)
 	}
 	return true, nil
 }