Merge pull request kubernetes#83350 from soltysh/cp_fix

k8s-ci-robot · web-flow · commit af67b2cbce54 · 2019-10-01T09:35:47.000-07:00
Update symlink warning
diff --git a/pkg/kubectl/cmd/cp/cp.go b/pkg/kubectl/cmd/cp/cp.go
@@ -470,7 +470,7 @@ func (o *CopyOptions) untarAll(src fileSpec, reader io.Reader, destDir, prefix s
 
 		if mode&os.ModeSymlink != 0 {
 			if !symlinkWarningPrinted && len(o.ExecParentCmdName) > 0 {
-				fmt.Fprintf(o.IOStreams.ErrOut, "warning: file %q is a symlink, skipping (consider using \"%s exec -n %q %q -- tar cf - %q | tar xf -\")\n", destFileName, o.ExecParentCmdName, src.PodNamespace, src.PodName, src.File)
+				fmt.Fprintf(o.IOStreams.ErrOut, "warning: skipping symlink: %q -> %q (consider using \"%s exec -n %q %q -- tar cf - %q | tar xf -\")\n", destFileName, header.Linkname, o.ExecParentCmdName, src.PodNamespace, src.PodName, src.File)
 				symlinkWarningPrinted = true
 				continue
 			}

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ func (o *CopyOptions) untarAll(src fileSpec, reader io.Reader, destDir, prefix s`
`470`	`470`
`471`	`471`	`if mode&os.ModeSymlink != 0 {`
`472`	`472`	`if !symlinkWarningPrinted && len(o.ExecParentCmdName) > 0 {`
`473`		`- fmt.Fprintf(o.IOStreams.ErrOut, "warning: file %q is a symlink, skipping (consider using \"%s exec -n %q %q -- tar cf - %q \| tar xf -\")\n", destFileName, o.ExecParentCmdName, src.PodNamespace, src.PodName, src.File)`
	`473`	`+ fmt.Fprintf(o.IOStreams.ErrOut, "warning: skipping symlink: %q -> %q (consider using \"%s exec -n %q %q -- tar cf - %q \| tar xf -\")\n", destFileName, header.Linkname, o.ExecParentCmdName, src.PodNamespace, src.PodName, src.File)`
`474`	`474`	`symlinkWarningPrinted = true`
`475`	`475`	`continue`
`476`	`476`	`}`