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>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
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] 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
|
|
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(-)
|
|
|
|
diff --git a/tests/test_passphrase.py b/tests/test_passphrase.py
|
|
index 0a235e9..35b3c59 100644
|
|
--- a/tests/test_passphrase.py
|
|
+++ b/tests/test_passphrase.py
|
|
@@ -41,7 +41,7 @@ class PassphraseTestCase(GpgHomeTestCase):
|
|
new_sigs = ctx.sign(plaintext, signature, gpgme.SIG_MODE_CLEAR)
|
|
except gpgme.GpgmeError as exc:
|
|
self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_GPGME)
|
|
- self.assertEqual(exc.args[1], gpgme.ERR_BAD_PASSPHRASE)
|
|
+ self.assertEqual(exc.args[1], gpgme.ERR_GENERAL)
|
|
else:
|
|
self.fail('gpgme.GpgmeError not raised')
|
|
|