Skip to content

Commit

Permalink
pyton-pygpme: refresh patches
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
akuster committed Apr 13, 2018
1 parent ab6dcf1 commit db55d22
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1c1812def711803382cc28caea1f35fb7ef774b0 Mon Sep 17 00:00:00 2001
From ed44474c11f577c1644910964a917a4cf701bb0f Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 26 Jan 2016 14:24:26 -0500
Subject: [PATCH 1/5] reflect 2.1 reporting for key imports
Subject: [PATCH] reflect 2.1 reporting for key imports

GnuPG 2.1 changes how it reports key imports. These changes should
make the pygpgme test suite compatible with GnuPG 2.1.
Expand All @@ -12,6 +12,7 @@ https://lists.gnupg.org/pipermail/gnupg-devel/2016-January/030718.html
Upstream-Status: Backport

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>

---
tests/test_import.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
Expand Down Expand Up @@ -86,3 +87,4 @@ index 10eb816..597eb47 100644
+ None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET))
self.assertEqual(result.imports[3],
('93C2240D6B8AA10AB28F701D2CF46B7FC97E6B0F',
None, gpgme.IMPORT_NEW))
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From dc75482af095d667a4a92655c4e7eb312e80c42d Mon Sep 17 00:00:00 2001
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 2/5] passphrase_cb is deprecated
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
Expand All @@ -19,6 +19,7 @@ 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(-)
Expand Down Expand Up @@ -48,3 +49,4 @@ index cd803c2..86892ca 100644
+
# import requested keys into the keyring
ctx = gpgme.Context()
for key in self.import_keys:
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 024fe219582143017b2f02bc924c0ed107b63619 Mon Sep 17 00:00:00 2001
From 579b5930e15de8855bf63b3c20b6c3aaf894c3eb Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 1 Feb 2016 19:27:59 -0500
Subject: [PATCH 3/5] handle generic error when no passphrase callback present
Subject: [PATCH] handle generic error when no passphrase callback present

apparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was
in loopback mode and no passphrase callback was supplied. Earlier
Expand All @@ -10,6 +10,7 @@ versions supplied ERR_BAD_PASSPHRASE.
Upstream-Status: Backport

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>

---
tests/test_passphrase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Expand All @@ -26,3 +27,4 @@ index 0a235e9..35b3c59 100644
+ self.assertEqual(exc.args[1], gpgme.ERR_GENERAL)
else:
self.fail('gpgme.GpgmeError not raised')

0 comments on commit db55d22

Please sign in to comment.