summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 16:20:26 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:41 -0700
commitdb55d22ba85057703d17e152a3dca1f446b52730 (patch)
tree07ed6c6231e80e65179cf1831a2a0bb3dcff22f7 /meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
parentab6dcf1a5204b0fd190cf54d28f4a09fa4c08cd3 (diff)
downloadmeta-openembedded-db55d22ba85057703d17e152a3dca1f446b52730.tar.gz
pyton-pygpme: refresh patches
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>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch')
-rw-r--r--meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch b/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
index 462f442286..6acb68bfe7 100644
--- a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
+++ b/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
@@ -1,7 +1,7 @@
1From 024fe219582143017b2f02bc924c0ed107b63619 Mon Sep 17 00:00:00 2001 1From 579b5930e15de8855bf63b3c20b6c3aaf894c3eb Mon Sep 17 00:00:00 2001
2From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 2From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
3Date: Mon, 1 Feb 2016 19:27:59 -0500 3Date: Mon, 1 Feb 2016 19:27:59 -0500
4Subject: [PATCH 3/5] handle generic error when no passphrase callback present 4Subject: [PATCH] handle generic error when no passphrase callback present
5 5
6apparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was 6apparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was
7in loopback mode and no passphrase callback was supplied. Earlier 7in loopback mode and no passphrase callback was supplied. Earlier
@@ -10,6 +10,7 @@ versions supplied ERR_BAD_PASSPHRASE.
10Upstream-Status: Backport 10Upstream-Status: Backport
11 11
12Signed-off-by: Catalin Enache <catalin.enache@windriver.com> 12Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
13
13--- 14---
14 tests/test_passphrase.py | 2 +- 15 tests/test_passphrase.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -26,3 +27,4 @@ index 0a235e9..35b3c59 100644
26+ self.assertEqual(exc.args[1], gpgme.ERR_GENERAL) 27+ self.assertEqual(exc.args[1], gpgme.ERR_GENERAL)
27 else: 28 else:
28 self.fail('gpgme.GpgmeError not raised') 29 self.fail('gpgme.GpgmeError not raised')
30