[lxc-devel] [distrobuilder/master] debootstrap: Fix GPG dir removal

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 363 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180309/f8e2ab19/attachment.bin>
-------------- next part --------------
From e317214c480b1b8a036f2c95a694faf28fe1642f Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Fri, 9 Mar 2018 09:09:22 +0100
Subject: [PATCH] debootstrap: Fix GPG dir removal

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 sources/debootstrap.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/debootstrap.go b/sources/debootstrap.go
index 70183a2..4b39f5f 100644
--- a/sources/debootstrap.go
+++ b/sources/debootstrap.go
@@ -37,7 +37,7 @@ func (s *Debootstrap) Run(source shared.DefinitionSource, release, arch, rootfsD
 		if err != nil {
 			return err
 		}
-		defer os.RemoveAll(path.Base(keyring))
+		defer os.RemoveAll(path.Dir(keyring))
 
 		args = append(args, "--keyring", keyring)
 	}