wsd/ProofKey.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 25a1d35467e0f13f2a801906640c9f39c8e4af84
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Feb 14 12:00:42 2020 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Feb 18 16:29:54 2020 +0100
Read proof key from source directory in debug builds
Change-Id: I3de5ec1d6993fdba8430f40c6c93327e90a151c2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88672
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index 528d83325..649427f38 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -164,7 +164,13 @@ Proof::Proof()
std::string Proof::ProofKeyPath()
{
- static const std::string keyPath = LOOLWSD_CONFIGDIR "/proof_key";
+ static const std::string keyPath =
+#if ENABLE_DEBUG
+ DEBUG_ABSSRCDIR
+#else
+ LOOLWSD_CONFIGDIR
+#endif
+ "/proof_key";
return keyPath;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
