[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet-merge: fix a syntax error when there's only one worker

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368088 )

Change subject: puppet-merge: fix a syntax error when there's only one worker
..


puppet-merge: fix a syntax error when there's only one worker

This adds a dumb no-op call to 'true' because the alternative
is adding a lengthy erb clause which I definitely won't
get right the first time.

Change-Id: If0611bc5a9bef3cd3af4d2ace01e3171de7998ee
---
M modules/puppetmaster/templates/puppet-merge.erb
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/puppetmaster/templates/puppet-merge.erb 
b/modules/puppetmaster/templates/puppet-merge.erb
index 92e3ea4..3233147 100755
--- a/modules/puppetmaster/templates/puppet-merge.erb
+++ b/modules/puppetmaster/templates/puppet-merge.erb
@@ -207,6 +207,8 @@
 fi
 <%- end -%>
   <%- end -%>
+  # avoid a syntax error if this list is empty
+  true
 fi
 # conftool-merge does need to run from >1 frontend, avoid running a second time
 if [ $running_user != $git_user ]; then

-- 
To view, visit https://gerrit.wikimedia.org/r/368088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If0611bc5a9bef3cd3af4d2ace01e3171de7998ee
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet-merge: fix a syntax error when there's only one worker

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368088 )

Change subject: puppet-merge: fix a syntax error when there's only one worker
..

puppet-merge: fix a syntax error when there's only one worker

This adds a dumb no-op call to 'true' because the alternative
is adding a lengthy erb clause which I definitely won't
get right the first time.

Change-Id: If0611bc5a9bef3cd3af4d2ace01e3171de7998ee
---
M modules/puppetmaster/templates/puppet-merge.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/368088/1

diff --git a/modules/puppetmaster/templates/puppet-merge.erb 
b/modules/puppetmaster/templates/puppet-merge.erb
index 92e3ea4..3233147 100755
--- a/modules/puppetmaster/templates/puppet-merge.erb
+++ b/modules/puppetmaster/templates/puppet-merge.erb
@@ -207,6 +207,8 @@
 fi
 <%- end -%>
   <%- end -%>
+  # avoid a syntax error if this list is empty
+  true
 fi
 # conftool-merge does need to run from >1 frontend, avoid running a second time
 if [ $running_user != $git_user ]; then

-- 
To view, visit https://gerrit.wikimedia.org/r/368088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0611bc5a9bef3cd3af4d2ace01e3171de7998ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits