Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102609
Change subject: Tools: Work around broken WMF package libvips-dev
......................................................................
Tools: Work around broken WMF package libvips-dev
The WMF repository has a custom, but broken package libvips-dev that
requires a package libtiff5-alt-dev, but does not provide it. To work
around this, we pin it so that the vanilla Ubuntu version of
libvips-dev gets preferred.
Bug: 52717
Change-Id: I222736d4053815a3c1feb57f285ccf0f0afac2c2
---
A modules/toollabs/files/wikimedia-tools.pref
M modules/toollabs/manifests/init.pp
2 files changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/102609/1
diff --git a/modules/toollabs/files/wikimedia-tools.pref
b/modules/toollabs/files/wikimedia-tools.pref
new file mode 100644
index 0000000..1e1b6c7
--- /dev/null
+++ b/modules/toollabs/files/wikimedia-tools.pref
@@ -0,0 +1,4 @@
+Explanation: Work around broken libvips-dev package in WMF repository
+Package: libvips-dev
+Pin: release o=Ubuntu
+Pin-Priority: 2002
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 4f8ede9..6263c34 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -114,6 +114,18 @@
group => 'root',
}
+ # The WMF repository has a custom, but broken package libvips-dev
+ # that requires a package libtiff5-alt-dev, but does not provide
+ # it. To work around this, we pin it so that the vanilla Ubuntu
+ # version of libvips-dev gets preferred.
+ file { '/etc/apt/preferences.d/wikimedia-tools.pref':
+ ensure => file,
+ source => 'puppet:///modules/toollabs/wikimedia-tools.pref',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ }
+
File <| title == '/etc/exim4/exim4.conf' |> {
content => undef,
source => [ "${store}/mail-relay",
'puppet:///modules/toollabs/exim4-norelay.conf' ],
@@ -126,4 +138,3 @@
target => "${store}/mail",
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/102609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I222736d4053815a3c1feb57f285ccf0f0afac2c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
