The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/6183
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 4375c825b08d568e9a8ba4c0f8abab31cb509a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Tue, 10 Sep 2019 13:42:22 +0100
Subject: [PATCH] lxd/storage/dir: Don't hide error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
lxd/storage_dir.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxd/storage_dir.go b/lxd/storage_dir.go
index 3c38cedcfd..cc97c104c9 100644
--- a/lxd/storage_dir.go
+++ b/lxd/storage_dir.go
@@ -613,9 +613,9 @@ func (s *storageDir) ContainerDelete(container container)
error {
err := os.RemoveAll(containerMntPoint)
if err != nil {
// RemovaAll fails on very long paths, so attempt an rm
-Rf
- output, err := shared.RunCommand("rm", "-Rf",
containerMntPoint)
+ _, err := shared.RunCommand("rm", "-Rf",
containerMntPoint)
if err != nil {
- return fmt.Errorf("error removing %s: %s",
containerMntPoint, output)
+ return fmt.Errorf("error removing %s: %s",
containerMntPoint, err)
}
}
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
