BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393495 )
Change subject: puppet4: s/trusted/can_trust/
......................................................................
puppet4: s/trusted/can_trust/
'trusted' is a reserved variable name in Puppet4
Bug: T181354
Change-Id: If4a5a9673ac2dbb7d955c6783c742c51e0d39082
---
M puppet/modules/apt/manifests/init.pp
M puppet/modules/apt/manifests/repository.pp
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/95/393495/1
diff --git a/puppet/modules/apt/manifests/init.pp
b/puppet/modules/apt/manifests/init.pp
index f294535..a7586e6 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -51,7 +51,7 @@
uri => 'https://mwv-apt.wmflabs.org/repo',
dist => "${::lsbdistcodename}-mwv-apt",
components => 'main',
- trusted => true,
+ can_trust => true,
source => false,
}
diff --git a/puppet/modules/apt/manifests/repository.pp
b/puppet/modules/apt/manifests/repository.pp
index ee11914..23a6c12 100644
--- a/puppet/modules/apt/manifests/repository.pp
+++ b/puppet/modules/apt/manifests/repository.pp
@@ -26,7 +26,7 @@
# [*keyfile*]
# GPG key used to sign packages in this repo. Default undef.
#
-# [*trusted*]
+# [*can_trust*]
# Should this repo be trusted for installing unsinged packages?
# Default false.
#
@@ -42,11 +42,11 @@
$components,
$source = true,
$keyfile = undef,
- $trusted = false,
+ $can_trust = false,
$comment_old = false,
$ensure = 'present',
) {
- $trust = $trusted ? {
+ $trust = $can_trust ? {
true => '[trusted=yes] ',
default => '',
}
--
To view, visit https://gerrit.wikimedia.org/r/393495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4a5a9673ac2dbb7d955c6783c742c51e0d39082
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
