From 247a79a1bad6a3562a28e2510543fcccc2691c9e Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sat, 27 May 2017 15:38:04 +0200 Subject: [PATCH] Fix #1: copying user's abuild keys failed --- pmb/build/init.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pmb/build/init.py b/pmb/build/init.py index 96ff1281..67f0e106 100644 --- a/pmb/build/init.py +++ b/pmb/build/init.py @@ -18,6 +18,7 @@ along with pmbootstrap. If not, see . """ import os import logging +import glob import pmb.config import pmb.chroot @@ -46,8 +47,9 @@ def init(args, suffix="native"): suffix) # Copy package signing key to /etc/apk/keys - pmb.chroot.root(args, ["cp", "/home/user/.abuild/*.pub", - "/etc/apk/keys/"], suffix) + for key in glob.glob(chroot + "/home/user/.abuild/*.pub"): + key = key[len(chroot):] + pmb.chroot.root(args, ["cp", key, "/etc/apk/keys/"], suffix) # Add gzip wrapper, that converts '-9' to '-1' if not os.path.exists(chroot + "/usr/local/bin/gzip"):