diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 16:20:26 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:41 -0700 |
commit | db55d22ba85057703d17e152a3dca1f446b52730 (patch) | |
tree | 07ed6c6231e80e65179cf1831a2a0bb3dcff22f7 /meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch | |
parent | ab6dcf1a5204b0fd190cf54d28f4a09fa4c08cd3 (diff) | |
download | meta-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/0001-reflect-2.1-reporting-for-key-imports.patch')
-rw-r--r-- | meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch b/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch index f5870372a1..1f31cb805e 100644 --- a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch +++ b/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1c1812def711803382cc28caea1f35fb7ef774b0 Mon Sep 17 00:00:00 2001 | 1 | From ed44474c11f577c1644910964a917a4cf701bb0f Mon Sep 17 00:00:00 2001 |
2 | From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2 | From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
3 | Date: Tue, 26 Jan 2016 14:24:26 -0500 | 3 | Date: Tue, 26 Jan 2016 14:24:26 -0500 |
4 | Subject: [PATCH 1/5] reflect 2.1 reporting for key imports | 4 | Subject: [PATCH] reflect 2.1 reporting for key imports |
5 | 5 | ||
6 | GnuPG 2.1 changes how it reports key imports. These changes should | 6 | GnuPG 2.1 changes how it reports key imports. These changes should |
7 | make the pygpgme test suite compatible with GnuPG 2.1. | 7 | make the pygpgme test suite compatible with GnuPG 2.1. |
@@ -12,6 +12,7 @@ https://lists.gnupg.org/pipermail/gnupg-devel/2016-January/030718.html | |||
12 | Upstream-Status: Backport | 12 | Upstream-Status: Backport |
13 | 13 | ||
14 | Signed-off-by: Catalin Enache <catalin.enache@windriver.com> | 14 | Signed-off-by: Catalin Enache <catalin.enache@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | tests/test_import.py | 22 +++++++++++----------- | 17 | tests/test_import.py | 22 +++++++++++----------- |
17 | 1 file changed, 11 insertions(+), 11 deletions(-) | 18 | 1 file changed, 11 insertions(+), 11 deletions(-) |
@@ -86,3 +87,4 @@ index 10eb816..597eb47 100644 | |||
86 | + None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) | 87 | + None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) |
87 | self.assertEqual(result.imports[3], | 88 | self.assertEqual(result.imports[3], |
88 | ('93C2240D6B8AA10AB28F701D2CF46B7FC97E6B0F', | 89 | ('93C2240D6B8AA10AB28F701D2CF46B7FC97E6B0F', |
90 | None, gpgme.IMPORT_NEW)) | ||