Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319898

Change subject: statistics: Don't install spelling libraries on debian
......................................................................

statistics: Don't install spelling libraries on debian

A lot of these packages don't exist on jessie...

Change-Id: I7046906f207734596213db114e4f915666f9f930
---
M modules/statistics/manifests/packages.pp
1 file changed, 67 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/319898/1

diff --git a/modules/statistics/manifests/packages.pp 
b/modules/statistics/manifests/packages.pp
index 092ada3..c8fab7b 100644
--- a/modules/statistics/manifests/packages.pp
+++ b/modules/statistics/manifests/packages.pp
@@ -93,66 +93,71 @@
         'r-recommended'    # CRAN-recommended packages (e.g. MASS, Matrix, 
boot)
     ])
 
-    # spell checker/dictionary packages for research (halfak)
-    # T99030 - for machine learning and natural language processing
-    # T121011 - for vandalism detection
-    ensure_packages([
-        'enchant', # generic spell checking library (uses myspell as backend)
-        'aspell-id',   # Indonesian dictionary for GNU aspell
-        'hunspell-vi', # Vietnamese dictionary for hunspell
-        'myspell-af', # Afrikaans dictionary for myspell
-        'myspell-bg', # Bulgarian dictionary for myspell
-        'myspell-ca', # Catalan dictionary for myspell
-        'myspell-cs', # Czech dictionary for myspell
-        # 'myspell-da', # The Comprehensive Danish Dictionary (DSDO) # 
conflicts with hunspell-vi
-        'myspell-de-at', # Austrian (German) dictionary for myspell
-        'myspell-de-ch', # Swiss (German) dictionary for myspell
-        'myspell-de-de', # German dictionary for myspell
-        'myspell-el-gr', # Greek (el_GR) dictionary for myspell
-        'myspell-en-au', # English_australian dictionary for myspell
-        'myspell-en-gb', # English_british dictionary for myspell
-        'myspell-en-us', # English_american dictionary for myspell
-        'myspell-en-za', # English_southafrican dictionary for myspell
-        'myspell-eo', # Esperanto dictionary for myspell
-        'myspell-es', # Spanish dictionary for myspell
-        'myspell-et', # Estonian dictionary for MySpell
-        'myspell-fa', # Persian (Farsi) dictionary for myspell
-        'myspell-fo', # Faroese dictionary for myspell
-        'myspell-fr', # French dictionary for myspell (Hydro-Quebec version)
-        'myspell-ga', # Irish (Gaeilge) dictionary for OpenOffice and Mozilla
-        'myspell-gd', # Scots Gaelic dictionary for myspell
-        'myspell-gv', # Manx Gaelic dictionary for myspell
-        'myspell-he', # Hebrew dictionary for myspell
-        'myspell-hr', # Croatian dictionary for myspell
-        'myspell-hu', # Hungarian dictionary for myspell
-        'myspell-hy', # Armenian dictionary for myspell
-        'myspell-it', # Italian dictionary for myspell
-        'myspell-ku', # Kurdish (Kurmanji) dictionary for myspell
-        'myspell-lt', # myspell dictionary for Lithuanian (LT)
-        'myspell-lv', # Latvian dictionary for Myspell
-        'myspell-nb', # Norwegian Bokmål dictionary for myspell
-        'myspell-nl', # Dutch dictionary for Hunspell
-        'myspell-nn', # Norwegian Nynorsk dictionary for myspell
-        'myspell-nr', # The Ndebele dictionary for myspell
-        'myspell-ns', # Northern Sotho dictionary for myspell
-        'myspell-pl', # Polish dictionary for myspell
-        'myspell-pt-br', # Brazilian Portuguese dictionary for myspell
-        'myspell-pt', # Portuguese dictionaries for myspell
-        'myspell-pt-pt', # European Portuguese dictionary for myspell
-        'myspell-ru', # Russian dictionary for MySpell
-        'myspell-sk', # Slovak dictionary for myspell
-        'myspell-sl', # Slovenian dictionary for myspell
-        'myspell-ss', # The Swazi dictionary for myspell
-        'myspell-st', # The Southern Sotho dictionary for myspell
-        'myspell-sv-se', # transitional dummy package
-        'myspell-sw', # Swahili dictionary for myspell
-        'myspell-th', # Thai dictionary for myspell
-        'myspell-tl', # Tagalog dictionary for myspell/hunspell
-        'myspell-tn', # The Tswana dictionary for myspell
-        'myspell-ts', # The Tsonga dictionary for myspell
-        'myspell-uk', # Ukrainian dictionary for myspell
-        'myspell-ve', # The Venda dictionary for myspell
-        'myspell-xh', # The Xhosa dictionary for myspell
-        'myspell-zu', # The Zulu dictionary for myspell
-    ])
+    if os_version('ubuntu >= trusty') {
+        # A lot of these packages don't exist on debian yet,
+        # and notebook* hosts are on debian. Let's just not install these
+        # on debian for now.
+        # spell checker/dictionary packages for research (halfak)
+        # T99030 - for machine learning and natural language processing
+        # T121011 - for vandalism detection
+        ensure_packages([
+            'enchant', # generic spell checking library (uses myspell as 
backend)
+            'aspell-id',   # Indonesian dictionary for GNU aspell
+            'hunspell-vi', # Vietnamese dictionary for hunspell
+            'myspell-af', # Afrikaans dictionary for myspell
+            'myspell-bg', # Bulgarian dictionary for myspell
+            'myspell-ca', # Catalan dictionary for myspell
+            'myspell-cs', # Czech dictionary for myspell
+            # 'myspell-da', # The Comprehensive Danish Dictionary (DSDO) # 
conflicts with hunspell-vi
+            'myspell-de-at', # Austrian (German) dictionary for myspell
+            'myspell-de-ch', # Swiss (German) dictionary for myspell
+            'myspell-de-de', # German dictionary for myspell
+            'myspell-el-gr', # Greek (el_GR) dictionary for myspell
+            'myspell-en-au', # English_australian dictionary for myspell
+            'myspell-en-gb', # English_british dictionary for myspell
+            'myspell-en-us', # English_american dictionary for myspell
+            'myspell-en-za', # English_southafrican dictionary for myspell
+            'myspell-eo', # Esperanto dictionary for myspell
+            'myspell-es', # Spanish dictionary for myspell
+            'myspell-et', # Estonian dictionary for MySpell
+            'myspell-fa', # Persian (Farsi) dictionary for myspell
+            'myspell-fo', # Faroese dictionary for myspell
+            'myspell-fr', # French dictionary for myspell (Hydro-Quebec 
version)
+            'myspell-ga', # Irish (Gaeilge) dictionary for OpenOffice and 
Mozilla
+            'myspell-gd', # Scots Gaelic dictionary for myspell
+            'myspell-gv', # Manx Gaelic dictionary for myspell
+            'myspell-he', # Hebrew dictionary for myspell
+            'myspell-hr', # Croatian dictionary for myspell
+            'myspell-hu', # Hungarian dictionary for myspell
+            'myspell-hy', # Armenian dictionary for myspell
+            'myspell-it', # Italian dictionary for myspell
+            'myspell-ku', # Kurdish (Kurmanji) dictionary for myspell
+            'myspell-lt', # myspell dictionary for Lithuanian (LT)
+            'myspell-lv', # Latvian dictionary for Myspell
+            'myspell-nb', # Norwegian Bokmål dictionary for myspell
+            'myspell-nl', # Dutch dictionary for Hunspell
+            'myspell-nn', # Norwegian Nynorsk dictionary for myspell
+            'myspell-nr', # The Ndebele dictionary for myspell
+            'myspell-ns', # Northern Sotho dictionary for myspell
+            'myspell-pl', # Polish dictionary for myspell
+            'myspell-pt-br', # Brazilian Portuguese dictionary for myspell
+            'myspell-pt', # Portuguese dictionaries for myspell
+            'myspell-pt-pt', # European Portuguese dictionary for myspell
+            'myspell-ru', # Russian dictionary for MySpell
+            'myspell-sk', # Slovak dictionary for myspell
+            'myspell-sl', # Slovenian dictionary for myspell
+            'myspell-ss', # The Swazi dictionary for myspell
+            'myspell-st', # The Southern Sotho dictionary for myspell
+            'myspell-sv-se', # transitional dummy package
+            'myspell-sw', # Swahili dictionary for myspell
+            'myspell-th', # Thai dictionary for myspell
+            'myspell-tl', # Tagalog dictionary for myspell/hunspell
+            'myspell-tn', # The Tswana dictionary for myspell
+            'myspell-ts', # The Tsonga dictionary for myspell
+            'myspell-uk', # Ukrainian dictionary for myspell
+            'myspell-ve', # The Venda dictionary for myspell
+            'myspell-xh', # The Xhosa dictionary for myspell
+            'myspell-zu', # The Zulu dictionary for myspell
+        ])
+    }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7046906f207734596213db114e4f915666f9f930
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to