diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-26 02:36:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 02:36:06 +0200 |
| commit | c9078936dd1bf5bdb59066eb1bdd179ac58f98e1 (patch) | |
| tree | a8d769074e3ba43e100341c974639166c46ca5eb /libpod/util_linux.go | |
| parent | fbf5e80337c6399aa54c8ea1bc316eddb369ab0b (diff) | |
| parent | dd81a44ccfa34585ef62319835c8bb421db9e334 (diff) | |
| download | podman-c9078936dd1bf5bdb59066eb1bdd179ac58f98e1.tar.gz podman-c9078936dd1bf5bdb59066eb1bdd179ac58f98e1.tar.bz2 podman-c9078936dd1bf5bdb59066eb1bdd179ac58f98e1.zip | |
Merge pull request #3419 from baude/removelibpodfrommainphase1
remove libpod from main
Diffstat (limited to 'libpod/util_linux.go')
| -rw-r--r-- | libpod/util_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/util_linux.go b/libpod/util_linux.go index a801df2ee..8752eba20 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/containerd/cgroups" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" @@ -61,7 +62,7 @@ func assembleSystemdCgroupName(baseSlice, newSlice string) (string, error) { const sliceSuffix = ".slice" if !strings.HasSuffix(baseSlice, sliceSuffix) { - return "", errors.Wrapf(ErrInvalidArg, "cannot assemble cgroup path with base %q - must end in .slice", baseSlice) + return "", errors.Wrapf(define.ErrInvalidArg, "cannot assemble cgroup path with base %q - must end in .slice", baseSlice) } noSlice := strings.TrimSuffix(baseSlice, sliceSuffix) |