Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403832 )
Change subject: mediawiki::fonts: fix noto font inclusion on jessie
......................................................................
mediawiki::fonts: fix noto font inclusion on jessie
follow-up to I64d1d86972d1d17
these fonts were supposed to be installed "if > jessie",
not "if >= jessie" since they only exist on stretch
Bug: T184664
Change-Id: Ibf38ff237fb85bdeeba52181cf7e11f6475a926a
---
M modules/mediawiki/manifests/packages/fonts.pp
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/manifests/packages/fonts.pp
b/modules/mediawiki/manifests/packages/fonts.pp
index b718d2b..b619871 100644
--- a/modules/mediawiki/manifests/packages/fonts.pp
+++ b/modules/mediawiki/manifests/packages/fonts.pp
@@ -73,6 +73,13 @@
)
}
+ if os_version('debian > jessie') {
+ require_package(
+ 'fonts-noto-hinted', # T184664
+ 'fonts-noto-unhinted' # T184664
+ )
+ }
+
if os_version('debian >= jessie') {
require_package(
'fonts-beng',
@@ -89,8 +96,6 @@
'fonts-sil-lateef',
'fonts-ipafont-gothic',
'fonts-ipafont-mincho',
- 'fonts-noto-hinted', # T184664
- 'fonts-noto-unhinted' # T184664
)
}
--
To view, visit https://gerrit.wikimedia.org/r/403832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf38ff237fb85bdeeba52181cf7e11f6475a926a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
