Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356065 )

Change subject: aptrepo: fix elastic.co's update filter
......................................................................

aptrepo: fix elastic.co's update filter

The current grep-dctrl hook emits this error:
  grep-dctrl: inconsistent modifiers of simple filters.

Fix this by moving -e in the sub-filter and only in the first one where
it's actually needed.

Change-Id: I6e8c9642f62f11042d21b442ba2e0ecf4cb1038a
---
M modules/aptrepo/files/updates
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/356065/1

diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates
index a6cdf94..ef65299 100644
--- a/modules/aptrepo/files/updates
+++ b/modules/aptrepo/files/updates
@@ -73,7 +73,7 @@
 GetInRelease: no
 Architectures: amd64
 VerifyRelease: D27D666CD88E42B4
-ListShellHook: grep-dctrl -e \( -S '^elasticsearch|kibana$' -a -F Version --eq 
5.3.2 \) -o \( -S '^logstash$' -a -F Version --eq 1:5.3.2-1 \) || [ $? -eq 1 ]
+ListShellHook: grep-dctrl \( -e -S '^elasticsearch|kibana$' -a -F Version --eq 
5.3.2 \) -o \( -S logstash -a -F Version --eq 1:5.3.2-1 \) || [ $? -eq 1 ]
 
 Name: elasticsearch-curator
 Method: http://packages.elastic.co/curator/5/debian

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e8c9642f62f11042d21b442ba2e0ecf4cb1038a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to