Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403623 )

Change subject: mediawiki: Move font packages onto individual lines in 
require_package()
......................................................................


mediawiki: Move font packages onto individual lines in require_package()

Change-Id: I2436a732eabaf4111514ba59da5e4655dadb53cb
---
M modules/mediawiki/manifests/packages/fonts.pp
1 file changed, 29 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 06b4b46..9377d94 100644
--- a/modules/mediawiki/manifests/packages/fonts.pp
+++ b/modules/mediawiki/manifests/packages/fonts.pp
@@ -52,11 +52,38 @@
     }
 
     if os_version('ubuntu >= trusty') {
-        require_package('ttf-bengali-fonts', 'ttf-devanagari-fonts', 
'ttf-gujarati-fonts', 'ttf-kannada-fonts', 'ttf-oriya-fonts', 
'ttf-punjabi-fonts', 'ttf-tamil-fonts', 'ttf-telugu-fonts', 'ttf-kochi-gothic', 
'ttf-kochi-mincho', 'fonts-mgopen')
+        require_package(
+            'ttf-bengali-fonts',
+            'ttf-devanagari-fonts',
+            'ttf-gujarati-fonts',
+            'ttf-kannada-fonts',
+            'ttf-oriya-fonts',
+            'ttf-punjabi-fonts',
+            'ttf-tamil-fonts',
+            'ttf-telugu-fonts',
+            'ttf-kochi-gothic',
+            'ttf-kochi-mincho',
+            'fonts-mgopen'
+        )
     }
 
     if os_version('debian >= jessie') {
-        require_package('fonts-beng', 'fonts-deva', 'fonts-gujr', 
'fonts-knda', 'fonts-mlym', 'fonts-orya', 'fonts-guru', 'fonts-taml', 
'fonts-telu', 'fonts-gujr-extra', 'fonts-noto-cjk', 'fonts-sil-lateef', 
'fonts-ipafont-gothic', 'fonts-ipafont-mincho')
+        require_package(
+            'fonts-beng',
+            'fonts-deva',
+            'fonts-gujr',
+            'fonts-knda',
+            'fonts-mlym',
+            'fonts-orya',
+            'fonts-guru',
+            'fonts-taml',
+            'fonts-telu',
+            'fonts-gujr-extra',
+            'fonts-noto-cjk',
+            'fonts-sil-lateef',
+            'fonts-ipafont-gothic',
+            'fonts-ipafont-mincho'
+        )
     }
 
     # In older releases (up to the version present in trusty), 
fontconfig-config provided

-- 
To view, visit https://gerrit.wikimedia.org/r/403623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2436a732eabaf4111514ba59da5e4655dadb53cb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to