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