diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-04 11:08:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 11:08:43 +0200 |
| commit | 51d0be42046f691e81cddfe2712baa14cecbdfbe (patch) | |
| tree | 31a4708b600b60a5a9c5529637721f1a5d88e195 /vendor/github.com/containerd/continuity/fs/copy.go | |
| parent | 7b941462d42aa76b134462ff92a6823359d2cf76 (diff) | |
| parent | 7d37f4bbfee8def704cf38ec74f91e3e0db61723 (diff) | |
| download | podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.gz podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.bz2 podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.zip | |
Merge pull request #6051 from rhatdan/containers.conf
Fixes for test/e2e/containers_conf_test.go
Diffstat (limited to 'vendor/github.com/containerd/continuity/fs/copy.go')
| -rw-r--r-- | vendor/github.com/containerd/continuity/fs/copy.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/github.com/containerd/continuity/fs/copy.go b/vendor/github.com/containerd/continuity/fs/copy.go index ad61022ad..818bba2cd 100644 --- a/vendor/github.com/containerd/continuity/fs/copy.go +++ b/vendor/github.com/containerd/continuity/fs/copy.go @@ -80,7 +80,7 @@ func copyDirectory(dst, src string, inodes map[uint64]string, o *copyDirOpts) er return errors.Wrapf(err, "failed to stat %s", src) } if !stat.IsDir() { - return errors.Errorf("source is not directory") + return errors.Errorf("source %s is not directory", src) } if st, err := os.Stat(dst); err != nil { @@ -104,6 +104,10 @@ func copyDirectory(dst, src string, inodes map[uint64]string, o *copyDirOpts) er return errors.Wrapf(err, "failed to copy file info for %s", dst) } + if err := copyXAttrs(dst, src, o.xeh); err != nil { + return errors.Wrap(err, "failed to copy xattrs") + } + for _, fi := range fis { source := filepath.Join(src, fi.Name()) target := filepath.Join(dst, fi.Name()) |