Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364450 )
Change subject: package_builder: Conditionalize dh-php inclusion
......................................................................
package_builder: Conditionalize dh-php inclusion
Conditionalize based on the operating system version the names of dh-php
and php-dev packages
Change-Id: I3f5c5fc1605cc98f1073f9e4ce67944c5b016aef
---
M modules/package_builder/manifests/init.pp
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/364450/1
diff --git a/modules/package_builder/manifests/init.pp
b/modules/package_builder/manifests/init.pp
index 6038d0c..7d45a0a 100644
--- a/modules/package_builder/manifests/init.pp
+++ b/modules/package_builder/manifests/init.pp
@@ -18,10 +18,11 @@
}
if os_version('ubuntu == trusty || debian == jessie') {
- require_package('php5-dev')
- }
- if os_version('debian >= stretch') {
- require_package('php-dev')
+ $php_dev='php5-dev'
+ $dh_php='dh-php5'
+ } else {
+ $php_dev='php-dev'
+ $dh_php='dh-php'
}
require_package([
@@ -35,7 +36,6 @@
'debian-keyring',
'dh-make',
'dh-autoreconf',
- 'dh-php5',
'dh-golang',
'openstack-pkg-tools',
'git-buildpackage',
@@ -56,6 +56,8 @@
'pkg-kde-tools',
'subversion',
'sphinx-common',
+ $php_dev,
+ $dh_php,
])
if $::operatingsystem == 'Ubuntu' {
--
To view, visit https://gerrit.wikimedia.org/r/364450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f5c5fc1605cc98f1073f9e4ce67944c5b016aef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
