]> code.ossystems Code Review - openembedded-core.git/commitdiff
gpg_sign.py: fix overwriting the RPM macro __gpg in a wrong way
authorLans Zhang <jia.zhang@windriver.com>
Tue, 11 Jul 2017 04:43:02 +0000 (12:43 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 17 Jul 2017 12:48:55 +0000 (13:48 +0100)
The RPM macro used in --define option should not be prefixed by %%.

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/lib/oe/gpg_sign.py

index 7ce767ee0a01aefc747d07a51dadabd7cf6cb6b9..c53df54a5b7132c70bc0b39728439d6d6f4b6386 100644 (file)
@@ -36,7 +36,7 @@ class LocalSigner(object):
             gpg_args += ' --pinentry-mode=loopback'
         cmd += "--define '_gpg_sign_cmd_extra_args %s' " % gpg_args
         if self.gpg_bin:
-            cmd += "--define '%%__gpg %s' " % self.gpg_bin
+            cmd += "--define '__gpg %s' " % self.gpg_bin
         if self.gpg_path:
             cmd += "--define '_gpg_path %s' " % self.gpg_path