mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
db55d22ba8
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file tests/test_import.py
Hunk #4 succeeded at 122 with fuzz 1.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From ba0dc8273e4f83bcd2d43baa5910aae34b93048c Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
|
Date: Mon, 1 Feb 2016 19:25:12 -0500
|
|
Subject: [PATCH] passphrase_cb is deprecated
|
|
|
|
https://bugs.gnupg.org/gnupg/issue767 indicates that
|
|
gpgme_set_passphrase_cb is a deprecated corner of the API and that
|
|
developers using gpgme should really rely on the gpg-agent to handle
|
|
this stuff. This should actually simplify things for most
|
|
installations -- just strip out all passphrase handling from your
|
|
application entirely, relying on gpg to figure out how to find the
|
|
agent, and relying on the agent figuring out how to prompt the user
|
|
(if necessary).
|
|
|
|
However, if a developer really wants to use the passphrase callback
|
|
approach, they'll have to use loopback pinentry. This sets up the
|
|
test suite to be able to make those tests.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
|
|
|
---
|
|
tests/util.py | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/util.py b/tests/util.py
|
|
index cd803c2..86892ca 100644
|
|
--- a/tests/util.py
|
|
+++ b/tests/util.py
|
|
@@ -28,7 +28,9 @@ keydir = os.path.join(os.path.dirname(__file__), 'keys')
|
|
|
|
class GpgHomeTestCase(unittest.TestCase):
|
|
|
|
- gpg_conf_contents = ''
|
|
+ gpg_conf_contents = 'pinentry-mode loopback'
|
|
+ gpg_agent_conf_contents = 'allow-loopback-pinentry'
|
|
+
|
|
import_keys = []
|
|
|
|
def keyfile(self, key):
|
|
@@ -41,6 +43,10 @@ class GpgHomeTestCase(unittest.TestCase):
|
|
fp.write(self.gpg_conf_contents.encode('UTF-8'))
|
|
fp.close()
|
|
|
|
+ fp = open(os.path.join(self._gpghome, 'gpg-agent.conf'), 'wb')
|
|
+ fp.write(self.gpg_agent_conf_contents.encode('UTF-8'))
|
|
+ fp.close()
|
|
+
|
|
# import requested keys into the keyring
|
|
ctx = gpgme.Context()
|
|
for key in self.import_keys:
|