summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2014-08-07 12:18:53 (GMT)
committerMichael Schroeder <mls@suse.de>2014-08-07 12:18:53 (GMT)
commit443ffa5d87691a7985f0e2fe250fe0a214495a64 (patch)
treebd969d69177bd4702f92fa333b7b7f69c4a41604
parent690af79397e0a73270ed7c9982099f085fc3a2a9 (diff)
parent118b57619b7e5910f0398fa194000e776db6ed11 (diff)
downloadobs-build-443ffa5d87691a7985f0e2fe250fe0a214495a64.tar.gz
obs-build-443ffa5d87691a7985f0e2fe250fe0a214495a64.tar.xz
Merge pull request #126 from andreas-schwab/master
avoid watchdog getting fooled by binary junk in logfile
-rw-r--r--build-vm2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-vm b/build-vm
index 1981cbb..4737e00 100644
--- a/build-vm
+++ b/build-vm
@@ -341,7 +341,7 @@ background_watchdog() {
WATCHDOG_START=
WATCHDOG_TIMEOUT=300
while sleep 5 ; do
- WATCH=`grep "### WATCHDOG MARKER" "$LOGFILE" | tail -n 1`
+ WATCH=`grep -a "### WATCHDOG MARKER" "$LOGFILE" | tail -n 1`
case $WATCH in
*WATCHDOG\ MARKER\ START*) test -n "$WATCHDOG_START" || WATCHDOG_START=`date +%s` ;;
*WATCHDOG\ MARKER\ END*) WATCHDOG_START= ;;