diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-04 19:52:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 19:52:00 +0200 |
| commit | 2a4e5aac197d86c836d9026e97b089744cc609c5 (patch) | |
| tree | 593e8326ae90a60c3293d9b4addcd4e30ce10e16 /cmd/podman | |
| parent | 7b0d6fcf0e3ce59f842273f670d742aaf597bf2f (diff) | |
| parent | 14ec550ec34e8e5914adf4ae9d1723e8a404bd38 (diff) | |
| download | podman-2a4e5aac197d86c836d9026e97b089744cc609c5.tar.gz podman-2a4e5aac197d86c836d9026e97b089744cc609c5.tar.bz2 podman-2a4e5aac197d86c836d9026e97b089744cc609c5.zip | |
Merge pull request #3260 from TomSweeneyRedHat/dev/tsweeney/buildah1.8.3
Vendor Buildah v1.8.3
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/cp.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/cp.go b/cmd/podman/cp.go index 907bde4b9..2e2ca272a 100644 --- a/cmd/podman/cp.go +++ b/cmd/podman/cp.go @@ -211,7 +211,7 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin } func getUser(mountPoint string, userspec string) (specs.User, error) { - uid, gid, err := chrootuser.GetUser(mountPoint, userspec) + uid, gid, _, err := chrootuser.GetUser(mountPoint, userspec) u := specs.User{ UID: uid, GID: gid, |