From 373d7276bc1c1b3c7a580001969fdcf7b60a0a98 Mon Sep 17 00:00:00 2001 From: Jia Zhang Date: Sun, 20 Aug 2017 15:02:15 +0800 Subject: [PATCH] signing-keys: clean up Signed-off-by: Jia Zhang --- meta-integrity/recipes-core/meta/signing-keys.bbappend | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-integrity/recipes-core/meta/signing-keys.bbappend b/meta-integrity/recipes-core/meta/signing-keys.bbappend index c09570a..4f64efa 100644 --- a/meta-integrity/recipes-core/meta/signing-keys.bbappend +++ b/meta-integrity/recipes-core/meta/signing-keys.bbappend @@ -5,7 +5,7 @@ python check_public_keys () { gpg_keyid = d.getVar('RPM_GPG_NAME', True) # Check RPM_GPG_NAME and RPM_GPG_PASSPHRASE - cmd = "%s --homedir %s --list-keys -a %s" % \ + cmd = "%s --homedir %s --list-keys %s" % \ (gpg_bin, gpg_path, gpg_keyid) status, output = oe.utils.getstatusoutput(cmd) if not status: @@ -16,10 +16,8 @@ python check_public_keys () { cmd = '%s --batch --homedir %s --import %s --passphrase %s' % \ (gpg_bin, gpg_path, gpg_key, d.getVar('RPM_GPG_PASSPHRASE', True)) status, output = oe.utils.getstatusoutput(cmd) - print (cmd) if status: raise bb.build.FuncFailed('Failed to import gpg key (%s): %s' % (gpg_key, output)) } -check_public_keys[cleandirs] = "${B}" do_get_public_keys[prefuncs] += "check_public_keys"