diff options
Diffstat (limited to 'meta-integrity/classes')
-rw-r--r-- | meta-integrity/classes/sign_rpm_ext.bbclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-integrity/classes/sign_rpm_ext.bbclass b/meta-integrity/classes/sign_rpm_ext.bbclass index 8b25d74..25aa998 100644 --- a/meta-integrity/classes/sign_rpm_ext.bbclass +++ b/meta-integrity/classes/sign_rpm_ext.bbclass | |||
@@ -29,8 +29,7 @@ python check_rpm_public_key () { | |||
29 | (gpg_bin, gpg_path, d.getVar('RPM_GPG_PASSPHRASE', True), gpg_key) | 29 | (gpg_bin, gpg_path, d.getVar('RPM_GPG_PASSPHRASE', True), gpg_key) |
30 | status, output = oe.utils.getstatusoutput(cmd) | 30 | status, output = oe.utils.getstatusoutput(cmd) |
31 | if status: | 31 | if status: |
32 | raise bb.build.FuncFailed('Failed to import gpg key (%s): %s' % | 32 | bb.fatal('Failed to import gpg key (%s): %s' % (gpg_key, output)) |
33 | (gpg_key, output)) | ||
34 | } | 33 | } |
35 | check_rpm_public_key[lockfiles] = "${TMPDIR}/check_rpm_public_key.lock" | 34 | check_rpm_public_key[lockfiles] = "${TMPDIR}/check_rpm_public_key.lock" |
36 | do_package_write_rpm[prefuncs] += "check_rpm_public_key" | 35 | do_package_write_rpm[prefuncs] += "check_rpm_public_key" |
@@ -46,6 +45,5 @@ python () { | |||
46 | if not os.path.exists(gpg_path): | 45 | if not os.path.exists(gpg_path): |
47 | status, output = oe.utils.getstatusoutput('mkdir -m 0700 -p %s' % gpg_path) | 46 | status, output = oe.utils.getstatusoutput('mkdir -m 0700 -p %s' % gpg_path) |
48 | if status: | 47 | if status: |
49 | raise bb.build.FuncFailed('Failed to create gpg keying %s: %s' % | 48 | bb.fatal('Failed to create gpg keying %s: %s' % (gpg_path, output)) |
50 | (gpg_path, output)) | ||
51 | } | 49 | } |