From 0fdc77886ccc101a28b11ce63e87a935c936d2ef Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Wed, 19 Jul 2017 20:02:32 +0200 Subject: [PATCH] adjust pkg/errors imports Signed-off-by: Antonio Murdaca --- daemon/graphdriver/devmapper/deviceset.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 51eaf45..2ef067c 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -29,8 +29,8 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/go-units" - "github.com/opencontainers/runc/libcontainer/label" + pkgerr "github.com/pkg/errors" ) var ( @@ -2719,10 +2719,10 @@ func NewDeviceSet(root string, doInit bool, options []string, uidMaps, gidMaps [ case "dm.libdm_log_level": level, err := strconv.ParseInt(val, 10, 32) if err != nil { - return nil, errors.Wrapf(err, "could not parse `dm.libdm_log_level=%s`", val) + return nil, pkgerr.Wrapf(err, "could not parse `dm.libdm_log_level=%s`", val) } if level < devicemapper.LogLevelFatal || level > devicemapper.LogLevelDebug { - return nil, errors.Errorf("dm.libdm_log_level must be in range [%d,%d]", devicemapper.LogLevelFatal, devicemapper.LogLevelDebug) + return nil, pkgerr.Errorf("dm.libdm_log_level must be in range [%d,%d]", devicemapper.LogLevelFatal, devicemapper.LogLevelDebug) } // Register a new logging callback with the specified level. devicemapper.LogInit(devicemapper.DefaultLogger{ -- 1.8.3.1