Ensure that CopyDirTo really ignores symlinks

There was some code that claimed to ignore symlinks, but:
 - It would run *after* recursive directory copying, so any symlinks to
   directories would still be copied (potentially creating a destination
   directory that is a lot bigger than the original)
 - It checked for the symlink bit in the result of Stat(), but that
   resolves the symlink and returns the mode bits of the target, so that
   code would never fire.

This fixes both problems by moving the check for symlinks up, and using
Lstat() instead of Stat(), so symlinks are ignored as intended.

Author: matthijskooijman

paths.go

@@ -435,25 +435,25 @@ func (p *Path) CopyDirTo(dst *Path) error {
 	}
 
 	for _, srcPath := range srcFiles {
-		srcPathInfo, err := srcPath.Stat()
+		srcPathInfo, err := srcPath.Lstat()
 		if err != nil {
 			return fmt.Errorf("getting stat info for %s: %s", srcPath, err)
 		}
-		dstPath := dst.Join(srcPath.Base())
 
+		// Skip symlinks.
+		if srcPathInfo.Mode()&os.ModeSymlink != 0 {
+			// TODO
+			continue
+		}
+
+		dstPath := dst.Join(srcPath.Base())
 		if srcPathInfo.IsDir() {
 			if err := srcPath.CopyDirTo(dstPath); err != nil {
 				return fmt.Errorf("copying %s to %s: %s", srcPath, dstPath, err)
 			}
 			continue
 		}
 
-		// Skip symlinks.
-		if srcPathInfo.Mode()&os.ModeSymlink != 0 {
-			// TODO
-			continue
-		}
-
 		if err := srcPath.CopyTo(dstPath); err != nil {
 			return fmt.Errorf("copying %s to %s: %s", srcPath, dstPath, err)
 		}

paths_test.go

@@ -243,6 +243,10 @@ func TestCopyDir(t *testing.T) {
 	require.False(t, isdir)
 	require.NoError(t, err)
 
+	exist, err = tmp.Join("dest", "symlinktofolder").ExistCheck()
+	require.False(t, exist)
+	require.NoError(t, err)
+
 	err = src.CopyDirTo(tmp.Join("dest"))
 	require.Error(t, err, "copying dir to already existing")