Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358381 )
Change subject: Use ffmpeg from jessie-backports on jessie-based video scalers
......................................................................
Use ffmpeg from jessie-backports on jessie-based video scalers
Previously a custom backport was uploaded to apt.wikimedia.org, but
since it's now in jessie-wikimedia, let's use this instead.
Bug: T145742
Change-Id: If05a824ff65c9febb4e934cb45c339534f45fdfb
---
M modules/mediawiki/manifests/packages/multimedia.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
diff --git a/modules/mediawiki/manifests/packages/multimedia.pp
b/modules/mediawiki/manifests/packages/multimedia.pp
index 4638244..b568d9e 100644
--- a/modules/mediawiki/manifests/packages/multimedia.pp
+++ b/modules/mediawiki/manifests/packages/multimedia.pp
@@ -19,4 +19,12 @@
]:
ensure => present,
}
+
+ if os_version('debian == jessie') {
+ apt::pin { 'ffmpeg':
+ pin => 'release a=jessie-backports',
+ priority => '1001',
+ before => Package['ffmpeg'],
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/358381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If05a824ff65c9febb4e934cb45c339534f45fdfb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
