diff options
| author | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
| commit | c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d (patch) | |
| tree | 3a2e569e333ccd9265237868d3f46b2d1e04e3a9 /gnu/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch | |
| parent | ad22c7185395a52bd90ea5890a2ac79f44d00352 (diff) | |
| parent | 61adfb00b11cc16a70e60f19fd8e0a838a3ef608 (diff) | |
| download | guix-patches-c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d.tar guix-patches-c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch')
| -rw-r--r-- | gnu/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/gnu/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch b/gnu/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch new file mode 100644 index 0000000000..86a8ed1691 --- /dev/null +++ b/gnu/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch @@ -0,0 +1,31 @@ +This patch comes from Debian. + +https://bugzilla.gnome.org/show_bug.cgi?id=771052 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835737 + +--- gcr-3.20.0.old/gcr/test-gnupg-collection.c 2017-06-29 14:26:33.810838197 -0400 ++++ gcr-3.20.0/gcr/test-gnupg-collection.c 2017-06-30 17:25:09.149383067 -0400 +@@ -115,6 +115,14 @@ + + g_object_unref (test->collection); + ++ /* remove potential gpg 2.1 extras, ignore any errors. */ ++ cmd = g_strdup_printf ("rm -rf %s/*.d", test->directory); ++ system(cmd); ++ g_free(cmd); ++ cmd = g_strdup_printf ("rm -f %s/.gpg-v21-migrated", test->directory); ++ system(cmd); ++ g_free(cmd); ++ + cmd = g_strdup_printf ("rm -f %s/*", test->directory); + g_spawn_check_exit_status (system (cmd), &error); + g_assert_no_error (error); +@@ -202,7 +210,7 @@ + GcrGnupgKey *key; + + _gcr_gnupg_collection_load_async (test->collection, NULL, on_async_ready, test); +- egg_test_wait_until (500); ++ egg_test_wait_until (2500); + g_assert (test->result); + _gcr_gnupg_collection_load_finish (test->collection, test->result, &error); + g_assert_no_error (error); |