[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6751/8267] gpg_sign.py: fix overwriting the RPM macro __gpg in a wrong way



commit 946a3dae158ed4709915645ba06dc9bab159be34
Author: Lans Zhang <jia zhang windriver com>
Date:   Tue Jul 11 12:43:02 2017 +0800

    gpg_sign.py: fix overwriting the RPM macro __gpg in a wrong way
    
    The RPM macro used in --define option should not be prefixed by %%.
    
    (From OE-Core rev: 2fda41cef26b600d599dfb7f2e61c5829e2b309c)
    
    Signed-off-by: Lans Zhang <jia zhang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/gpg_sign.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index 7ce767e..c53df54 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -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
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]