From f174a72d10037e2e6356fbee3f71ea124515d758 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Sat, 25 Apr 2015 05:43:29 +0200 Subject: [merge] Print current time after merge has finished. Sometimes it's interesting to know how long time a merge took. --- packaging/docker/catlfish-dev/merge.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/docker/catlfish-dev/merge.sh b/packaging/docker/catlfish-dev/merge.sh index b3658cd..40f623c 100755 --- a/packaging/docker/catlfish-dev/merge.sh +++ b/packaging/docker/catlfish-dev/merge.sh @@ -22,6 +22,7 @@ while true; do python /usr/local/src/catlfish/tools/merge.py \ --config /usr/local/etc/catlfish/system.cfg \ --localconfig /usr/local/etc/catlfish/merge.cfg + date echo "merge: waiting $(expr $S2 / 60)m$(expr $S2 % 60)s before merging again" sleep $S2 done -- cgit v1.1