Merge pull request #2418 from AkihiroSuda/fix-bad-rebase-2413

fix "libcontainer/cgroups/fs/cpuset.go:63:14: undefined: fmt"
This commit is contained in:
Kir Kolyshkin 2020-05-19 11:28:09 -07:00 committed by GitHub
commit b207d578ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,6 @@ package fs
import (
"bytes"
"errors"
"io/ioutil"
"os"
"path/filepath"
@ -14,6 +13,7 @@ import (
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
"github.com/opencontainers/runc/libcontainer/configs"
libcontainerUtils "github.com/opencontainers/runc/libcontainer/utils"
"github.com/pkg/errors"
)
type CpusetGroup struct {
@ -60,7 +60,7 @@ func getMount(dir string) (string, error) {
return "", err
}
if len(mi) < 1 {
return "", fmt.Errorf("Can't find mount point of %s", dir)
return "", errors.Errorf("Can't find mount point of %s", dir)
}
// find the longest mount point