Ori.livneh has submitted this change and it was merged.
Change subject: Fix annoyance with ctrl-C in mwscriptwikiset scripts
......................................................................
Fix annoyance with ctrl-C in mwscriptwikiset scripts
* This seems to happen due to the "sudo -u apache" in one of the scripts
Change-Id: I39ac2028c37b2aeae33773da57ac56f682f2f577
---
M files/misc/scripts/mwscriptwikiset
M files/misc/scripts/mwscriptwikiset-quiet
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/mwscriptwikiset
b/files/misc/scripts/mwscriptwikiset
index 1c9b948..f9c8e1c 100755
--- a/files/misc/scripts/mwscriptwikiset
+++ b/files/misc/scripts/mwscriptwikiset
@@ -37,6 +37,7 @@
echo "$DBNAME"
echo "-------------------------------------"
$MWSCRIPT "$SCRIPTFILE" "$DBNAME" $SCRIPTARGS
+ test $? -gt 128 && break; # make Ctrl-C actually work
echo "-------------------------------------"
echo ""
done
diff --git a/files/misc/scripts/mwscriptwikiset-quiet
b/files/misc/scripts/mwscriptwikiset-quiet
index 0bfa4d7..f3bd3c8 100755
--- a/files/misc/scripts/mwscriptwikiset-quiet
+++ b/files/misc/scripts/mwscriptwikiset-quiet
@@ -33,6 +33,7 @@
for DBNAME in $(cat $MW_DBLISTS/$LISTFILE)
do
RES=$(mwscript "$SCRIPTFILE" "$DBNAME" $SCRIPTARGS)
+ test $? -gt 128 && break; # make Ctrl-C actually work
if [ -n "$RES" ]; then
echo "-------------------------------------"
echo "$DBNAME"
--
To view, visit https://gerrit.wikimedia.org/r/91990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39ac2028c37b2aeae33773da57ac56f682f2f577
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
