Vendor after merging erikh/image:kube-fix

Based on https://github.com/projectatomic/skopeo/pull/289 by Erik
Hollensbe <github@hollensbe.org>

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Erik Hollensbe
2017-01-18 11:01:58 -08:00
committed by Miloslav Trmač
parent 81404fb71c
commit 1ee74864e9
51 changed files with 11764 additions and 32 deletions

View File

@@ -343,7 +343,7 @@ func GetExecUser(userSpec string, defaults *ExecUser, passwd, group io.Reader) (
if len(groups) > 0 {
// First match wins, even if there's more than one matching entry.
user.Gid = groups[0].Gid
} else if groupArg != "" {
} else {
// If we can't find a group with the given name, the only other valid
// option is if it's a numeric group name with no associated entry in group.