[lxc-devel] [lxd/master] lxc/image: Fix more dir handling on snap

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 370 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200705/98aaa37d/attachment.bin>
-------------- next part --------------
From 3815da132d09c75302ea8d7535615dd12857a220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 5 Jul 2020 11:51:56 -0400
Subject: [PATCH] lxc/image: Fix more dir handling on snap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7622

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxc/image.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxc/image.go b/lxc/image.go
index e6e32cdc5c..a0b33d94be 100644
--- a/lxc/image.go
+++ b/lxc/image.go
@@ -560,7 +560,7 @@ func (c *cmdImageExport) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Rename files
-	if shared.IsDir(target) {
+	if shared.IsDir(shared.HostPath(target)) {
 		if resp.MetaName != "" {
 			err := os.Rename(targetMeta, shared.HostPath(filepath.Join(target, resp.MetaName)))
 			if err != nil {