.gitreview | 3 +--
desktop/source/app/check_ext_deps.cxx | 9 ++++++---
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit a7aec9d77cb56f241b6b42936a5671e142c034f7
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Oct 23 14:53:49 2018 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Tue Oct 23 14:53:49 2018 +0200
Update .gitreview
diff --git a/.gitreview b/.gitreview
index ec9d1f3cd807..7c1def7071cf 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,4 @@ host=logerrit
port=29418
project=core
defaultremote=logerrit
-defaultbranch=libreoffice-6-0
-
+defaultbranch=feature/cib_contract138b
commit 4b025b0858da9f346cd36ad5b3b7d6399152a689
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 18 16:44:57 2018 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Tue Oct 23 14:53:09 2018 +0200
Sync extension registration on startup
There are cases where the extension registration becomes invalid
(empty rdb files) which leads to extensions not starting up,
although installed and active.
Syncing extension repos on startup fixes that.
The performance impact is negligible (1ms in my measurements).
Change-Id: I10475ce6a054b43c4591b17a8486648ca6a30068
Reviewed-on: https://gerrit.libreoffice.org/61943
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
(cherry picked from commit 8959bb300b05be9fafbf30e553b35fb517bdf786)
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index 0fb8a9aa60bd..da94d0c93539 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -422,9 +422,12 @@ void Desktop::SynchronizeExtensionRepositories()
silent->getInteractionHandler());
#endif
} else {
- // reinstallDeployedExtensions above already calls syncRepositories
- // internally:
- dp_misc::syncRepositories(false, silent);
+ // reinstallDeployedExtensions above already calls syncRepositories
internally
+
+ // Force syncing repositories on startup. There are cases where the
extension
+ // registration becomes invalid which leads to extensions not starting
up, although
+ // installed and active. Syncing extension repos on startup fixes that.
+ dp_misc::syncRepositories(/*force=*/true, silent);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
