jenkins-bot has submitted this change and it was merged.
Change subject: Use '-f' rather than '|| true' trick to suppress error on
nonexistant files
......................................................................
Use '-f' rather than '|| true' trick to suppress error on nonexistant files
More straightforward, less tricky.
Change-Id: I1ff4896c88c59dc8d5b10ada427388e65d3f8535
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index c91fd0e..575a09d 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -67,7 +67,7 @@
# refers to is missing, assume it is residual of a discarded instance
and
# delete it.
exec { 'check settings':
- command => "rm ${dir}/LocalSettings.php || true",
+ command => "rm -f ${dir}/LocalSettings.php",
notify => Exec['mediawiki setup'],
require => [ Package['php5'], Git::Clone['mediawiki/core'],
Service['mysql'] ],
unless => "php ${dir}/maintenance/sql.php </dev/null",
--
To view, visit https://gerrit.wikimedia.org/r/71848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ff4896c88c59dc8d5b10ada427388e65d3f8535
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
