summaryrefslogtreecommitdiff
path: root/BitKeeper/triggers
diff options
context:
space:
mode:
authorunknown <iggy@rolltop.ignatz42.dyndns.org>2006-09-13 14:16:53 -0400
committerunknown <iggy@rolltop.ignatz42.dyndns.org>2006-09-13 14:16:53 -0400
commit198b266ab2a1699d1577c8cfe7f82c44b6a05403 (patch)
tree0447ebc8db0ea8be26c4c56704a1c2cc00219901 /BitKeeper/triggers
parent3505bee96150d2b8574015f765a287d9e2f8774e (diff)
parente90f2c4ff57a52920f44d534796dca7dc45597b7 (diff)
downloadmariadb-git-198b266ab2a1699d1577c8cfe7f82c44b6a05403.tar.gz
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix BitKeeper/etc/ignore: auto-union BitKeeper/triggers/post-commit: Manual merge. Opted for the method that uses temp files for improved troubleshooting.
Diffstat (limited to 'BitKeeper/triggers')
-rwxr-xr-xBitKeeper/triggers/post-commit18
1 files changed, 9 insertions, 9 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index ce5e03b0ac9..7f8f8f1d4b8 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -6,6 +6,7 @@ COMMITS=commits@lists.mysql.com
DOCS=docs-commit@mysql.com
LIMIT=10000
VERSION="5.1"
+BKROOT=`bk root`
if [ "$REAL_EMAIL" = "" ]
then
@@ -14,12 +15,6 @@ else
FROM=$REAL_EMAIL
fi
-if [ -x /usr/sbin/sendmail ]; then
- SENDMAIL=/usr/sbin/sendmail
-else
- SENDMAIL=sendmail
-fi
-
BK_STATUS=$BK_STATUS$BK_COMMIT
if [ "$BK_STATUS" = OK ]
@@ -64,7 +59,9 @@ $BH
EOF
bk changes -v -r+
bk cset -r+ -d
- ) | $SENDMAIL -t
+ ) > $BKROOT/BitKeeper/tmp/dev_public.txt
+
+bk sendmail -t < $BKROOT/BitKeeper/tmp/dev_public.txt
#++
# commits@ mail
@@ -88,7 +85,9 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
EOF
bk changes -v -r+
bk cset -r+ -d
- ) | head -n $LIMIT | $SENDMAIL -t
+ ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt
+
+bk sendmail -t < $BKROOT/BitKeeper/tmp/commits.txt
#++
# docs-commit@ mail
@@ -108,7 +107,8 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
EOF
bk changes -v -r+
bk cset -r+ -d
- ) | $SENDMAIL -t
+ ) > $BKROOT/BitKeeper/tmp/docs.txt
+ bk sendmail -t < $BKROOT/BitKeeper/tmp/docs.txt
fi
else