Ema has submitted this change and it was merged.
Change subject: run-no-puppet: do not interpret grep pattern as a regex
......................................................................
run-no-puppet: do not interpret grep pattern as a regex
We are including brackets in the disable message, and more in general
there could be metacharacters in $1.
Call grep with -F to avoid interpreting PATTERN as a regular expression.
Change-Id: Ibb1806597556cc1b8f06c11d2b6e89960be67635
---
M modules/base/files/puppet/run-no-puppet
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ema: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
diff --git a/modules/base/files/puppet/run-no-puppet
b/modules/base/files/puppet/run-no-puppet
index eb4a15f..bb638e2 100644
--- a/modules/base/files/puppet/run-no-puppet
+++ b/modules/base/files/puppet/run-no-puppet
@@ -13,7 +13,7 @@
# Re-enable puppet only if it was disabled by us
enable_puppet() {
jq -r '.disabled_message' < /var/lib/puppet/state/agent_disabled.lock |
- grep -xq "$MESSAGE" && puppet agent --enable
+ grep -Fxq "$MESSAGE" && puppet agent --enable
}
# Disable puppet setting the reason to $MESSAGE
--
To view, visit https://gerrit.wikimedia.org/r/312004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb1806597556cc1b8f06c11d2b6e89960be67635
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
