--- Exec[reinstall-wmf-opensearch-plugins].orig
+++ Exec[reinstall-wmf-opensearch-plugins]
@@
- command => /usr/bin/apt-get -q -y install --reinstall wmf-opensearch-search-plugins
+ command => /usr/bin/apt-get -q -y -o Dpkg::Options::=--force-overwrite install --reinstall wmf-opensearch-search-plugins
@@
- onlyif => /usr/bin/test -d /usr/share/opensearch/plugins && /usr/bin/test -z "$(/usr/bin/ls -A /usr/share/opensearch/plugins/ 2>/dev/null)"
+ onlyif => /usr/bin/test ! -d /usr/share/opensearch/plugins/opensearch-extra
Package[wmf-opensearch-search-plugins]
- Parameters differences:
--- Package[wmf-opensearch-search-plugins].orig
+++ Package[wmf-opensearch-search-plugins]
+ install_options => ['-o', 'Dpkg::Options::=--force-overwrite']
- Package[opensearch]
- Parameters differences:
--- Package[opensearch].orig
+++ Package[opensearch]
+ install_options => ['-o', 'Dpkg::Options::=--force-overwrite']
- Exec[strip-upstream-opensearch-plugins]
- Parameters differences:
--- Exec[strip-upstream-opensearch-plugins].orig
+++ Exec[strip-upstream-opensearch-plugins]
+ provider => shell
@@
- command => /usr/bin/find /usr/share/opensearch/plugins -mindepth 1 -delete
+ command => /usr/bin/find /usr/share/opensearch/plugins -mindepth 1 -maxdepth 1 -not -name 'opensearch-knn' -not -name 'opensearch-ltr' -exec /bin/rm -rf {} +