summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.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/0002-passphrase_cb-is-deprecated.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/0002-passphrase_cb-is-deprecated.patch')
-rw-r--r--meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch b/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch
index ccd941f7bb..c18cf3feba 100644
--- a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch
+++ b/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch
@@ -1,7 +1,7 @@
1From dc75482af095d667a4a92655c4e7eb312e80c42d Mon Sep 17 00:00:00 2001 1From ba0dc8273e4f83bcd2d43baa5910aae34b93048c 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:25:12 -0500 3Date: Mon, 1 Feb 2016 19:25:12 -0500
4Subject: [PATCH 2/5] passphrase_cb is deprecated 4Subject: [PATCH] passphrase_cb is deprecated
5 5
6https://bugs.gnupg.org/gnupg/issue767 indicates that 6https://bugs.gnupg.org/gnupg/issue767 indicates that
7gpgme_set_passphrase_cb is a deprecated corner of the API and that 7gpgme_set_passphrase_cb is a deprecated corner of the API and that
@@ -19,6 +19,7 @@ test suite to be able to make those tests.
19Upstream-Status: Backport 19Upstream-Status: Backport
20 20
21Signed-off-by: Catalin Enache <catalin.enache@windriver.com> 21Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
22
22--- 23---
23 tests/util.py | 8 +++++++- 24 tests/util.py | 8 +++++++-
24 1 file changed, 7 insertions(+), 1 deletion(-) 25 1 file changed, 7 insertions(+), 1 deletion(-)
@@ -48,3 +49,4 @@ index cd803c2..86892ca 100644
48+ 49+
49 # import requested keys into the keyring 50 # import requested keys into the keyring
50 ctx = gpgme.Context() 51 ctx = gpgme.Context()
52 for key in self.import_keys: