lib/oe/gpg_sign: make gpg version a property of the signer
(From OE-Core rev: a00a362e3dc18ba04230cbbd6f91264e5d76f40d) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8032d64c43
commit
7f4278d472
|
@ -10,6 +10,7 @@ class LocalSigner(object):
|
|||
self.gpg_bin = d.getVar('GPG_BIN') or \
|
||||
bb.utils.which(os.getenv('PATH'), 'gpg')
|
||||
self.gpg_path = d.getVar('GPG_PATH')
|
||||
self.gpg_version = self.get_gpg_version()
|
||||
self.rpm_bin = bb.utils.which(os.getenv('PATH'), "rpm")
|
||||
|
||||
def export_pubkey(self, output_file, keyid, armor=True):
|
||||
|
@ -59,9 +60,7 @@ class LocalSigner(object):
|
|||
|
||||
#gpg > 2.1 supports password pipes only through the loopback interface
|
||||
#gpg < 2.1 errors out if given unknown parameters
|
||||
dots = self.get_gpg_version().split('.')
|
||||
assert len(dots) >= 2
|
||||
if int(dots[0]) >= 2 and int(dots[1]) >= 1:
|
||||
if self.gpg_version > (2,1,):
|
||||
cmd += ['--pinentry-mode', 'loopback']
|
||||
|
||||
cmd += [input_file]
|
||||
|
@ -88,10 +87,11 @@ class LocalSigner(object):
|
|||
|
||||
|
||||
def get_gpg_version(self):
|
||||
"""Return the gpg version"""
|
||||
"""Return the gpg version as a tuple of ints"""
|
||||
import subprocess
|
||||
try:
|
||||
return subprocess.check_output((self.gpg_bin, "--version")).split()[2].decode("utf-8")
|
||||
ver_str = subprocess.check_output((self.gpg_bin, "--version")).split()[2].decode("utf-8")
|
||||
return tuple([int(i) for i in ver_str.split('.')])
|
||||
except subprocess.CalledProcessError as e:
|
||||
raise bb.build.FuncFailed("Could not get gpg version: %s" % e)
|
||||
|
||||
|
|
Loading…
Reference in New Issue