Merlijn van Deen has uploaded a new change for review.

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

Change subject: tools: Fix trusty vs precise packages
......................................................................

tools: Fix trusty vs precise packages

Bug: T97628
Change-Id: Ic114ae7b94d0f442dd63de8a3dcc0bb61c06e72c
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/209990/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index e570219..cac51a3 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -116,9 +116,6 @@
         'libtask-weaken-perl',
         'libtest-exception-perl',      # For Checkwiki.
         'libtext-diff-perl',           # T60744
-        'libthreads-perl',
-        'libthreads-shared-perl',
-        'libtime-local-perl',
         'libtimedate-perl',
         'liburi-encode-perl',
         'liburi-perl',
@@ -128,6 +125,7 @@
         'libxml-parser-perl',
         'libxml-simple-perl',
         'libxml-xpathengine-perl',     # For Checkwiki.
+        'perl-modules',
 
         # Python libraries
         'python-apport',
@@ -215,7 +213,6 @@
         'tcl-trf',                     # T58995
         'tclcurl',
         'tcllib',
-        'tclthread',
         'tdom',                        # T58995
 
         # Tesseract OCR (T67354).
@@ -382,9 +379,13 @@
             'libgdal1-1.7.0',              # T58995
             'libmpc2',
             'libprotobuf7',                # T58995
+            'libtime-local-perl',          # now part of perl-modules
+            'libthreads-shared-perl',      # now part of perl
+            'libthreads-perl',             # now part of perl
             'libvips15',
             'mysql-client',                # mariadb-client just... doesn't 
work on precise. Apt failures
             'pyflakes',
+            'tclthread',                   # now called tcl-thread
             # no nodejs-legacy             (presumably, -legacy makes a 
symlink that is default in precise)
             ]:
             ensure => latest,
@@ -401,6 +402,7 @@
             'mariadb-client',              # For /usr/bin/mysql, is broken on 
precise atm
             'python-flake8',
             'python3-flake8',
+            'tcl-thread',
             ]:
             ensure => latest,
         }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic114ae7b94d0f442dd63de8a3dcc0bb61c06e72c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen <[email protected]>

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

Reply via email to