[lxc-devel] [go-lxc/v2] container, error: return correct error

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 365 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161124/278cb572/attachment.bin>
-------------- next part --------------
From 2a4cac1591277a37767256ce1b80481cd696dcdb Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Thu, 24 Nov 2016 06:27:28 +0100
Subject: [PATCH] container, error: return correct error

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 container.go | 2 +-
 error.go     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/container.go b/container.go
index d44315a..e41a8b0 100644
--- a/container.go
+++ b/container.go
@@ -757,7 +757,7 @@ func (c *Container) ClearConfigItem(key string) error {
 	defer C.free(unsafe.Pointer(ckey))
 
 	if !bool(C.go_lxc_clear_config_item(c.container, ckey)) {
-		return ErrClearingCgroupItemFailed
+		return ErrClearingConfigItemFailed
 	}
 	return nil
 }
diff --git a/error.go b/error.go
index 708e2ae..b89d903 100644
--- a/error.go
+++ b/error.go
@@ -16,6 +16,7 @@ var (
 	ErrAttachInterfaceFailed         = NewError("attaching specified netdev to the container failed")
 	ErrBlkioUsage                    = NewError("BlkioUsage for the container failed")
 	ErrCheckpointFailed              = NewError("checkpoint failed")
+	ErrClearingConfigItemFailed      = NewError("clearing config item for the container failed")
 	ErrClearingCgroupItemFailed      = NewError("clearing cgroup item for the container failed")
 	ErrCloneFailed                   = NewError("cloning the container failed")
 	ErrCloseAllFdsFailed             = NewError("setting close_all_fds flag for container failed")