~ruther/guix-local

ref: 1c85ecec8e8337ee99c7e3a59587afd6512db425 guix-local/gnu/packages/patches/kpmcore-fix-tests.patch -rw-r--r-- 1.1 KiB
1c85ecec — Ekaitz Zarraga gnu: Add lib3ds. 6 years ago 
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

Git commit c02d59aa6d314678cef9683f96b28e2a1abd82b7 by Andrius Štikonas, on behalf of Hartmut Goebel.
Committed on 07/11/2019 at 22:16.
Pushed by stikonas into branch '4.0'.

Fix test for kpmcore: stop helper only if formerly started.

See https://bugs.kde.org/413851 and https://phabricator.kde.org/D25161

diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp
--- a/src/util/externalcommand.cpp
+++ b/src/util/externalcommand.cpp
@@ -433,14 +433,17 @@
 
 void ExternalCommand::stopHelper()
 {
+    if (!helperStarted)
+        return;
     auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
                     QStringLiteral("/Helper"), QDBusConnection::systemBus());
     QByteArray request;
     const quint64 nonce = interface->getNonce();
     request.setNum(nonce);
     QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512);
     interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce);
 
+    helperStarted = false;
     delete privateKey;
     delete init;
 }