Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404307 )
Change subject: apt: make apt::conf and apt::pin configs happen before removing
apt.conf
......................................................................
apt: make apt::conf and apt::pin configs happen before removing apt.conf
Else, we might end up with a period where packages are installed with an
invalid configuration and can fail to install, or even be installed at
wrong versions.
Change-Id: I321f86d185e642e810e72d21cbcdc964162b6f6e
---
M modules/apt/manifests/init.pp
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/404307/1
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index ed35d23..169c92f 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -56,6 +56,8 @@
ensure => absent,
notify => Exec['apt-get update'],
}
+ Apt::Conf <| |> -> File['/etc/apt/apt.conf']
+ Apt::Pin <| |> -> File['/etc/apt/apt.conf']
if $use_proxy {
$http_proxy = "http://webproxy.${::site}.wmnet:8080";
--
To view, visit https://gerrit.wikimedia.org/r/404307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I321f86d185e642e810e72d21cbcdc964162b6f6e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
