------------------------------------------------------------
revno: 1199
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Sun 2009-09-27 13:35:39 -0700
message:
Changed contrib/mmdsr to use mktemp to create temp files.
modified:
NEWS
contrib/mmdsr
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription.
=== modified file 'NEWS'
--- NEWS 2009-09-13 22:52:21 +0000
+++ NEWS 2009-09-27 20:35:39 +0000
@@ -62,7 +62,8 @@
- Added recognition for more bounces.
- - Updated contrib/mmdsr to report preserved messages.
+ - Updated contrib/mmdsr to report preserved messages and to use mktemp to
+ create temp files.
2.1.12 (23-Feb-2009)
=== modified file 'contrib/mmdsr'
--- contrib/mmdsr 2009-07-31 19:59:38 +0000
+++ contrib/mmdsr 2009-09-27 20:35:39 +0000
@@ -172,6 +172,10 @@
# 0.0.20 Update by Mark Sapiro <[email protected]>
# Updated on: Sun Jul 26 08:56:41 PDT 2009
# Added report of files in the preserved messages directory.
+#
+# 0.0.21 Update by Mark Sapiro <[email protected]>
+# Updated on: Sun Sep 27 12:45:44 PDT 2009
+# Refactored to use mktemp to create temp files
###############################################################################
# Set up locations of standard commands, directories, etc....
@@ -187,6 +191,7 @@
GREP="/bin/grep"
HEAD="/usr/bin/head"
LS="/bin/ls"
+MKTEMP="/bin/mktemp"
PS="/bin/ps"
RM="/bin/rm"
SED="/bin/sed"
@@ -194,7 +199,6 @@
SLEEP="/bin/sleep"
SORT="/usr/bin/sort"
TAIL="/usr/bin/tail"
-TOUCH="/bin/touch"
TR="/usr/bin/tr"
UNIQ="/usr/bin/uniq"
XARGS="/usr/bin/xargs"
@@ -308,10 +312,8 @@
fi
fi
-TMP="$TMPDIR/.$PROG.$$"
-TMPLOG="$TMP.log"
-$RM -f $TMP
-$TOUCH $TMP
+TMP=`$MKTEMP -d $TMPDIR`
+TMPLOG=`$MKTEMP -d $TMPDIR`
if [ "${RCPTS}x" != "x" ] ; then
echo "From: ${SENDER}" >> $TMP
@@ -332,16 +334,14 @@
for LOG in $SUM_LOGS
do
- $RM -f $TMPLOG
- $TOUCH $TMPLOG
echo "Log file: $LOG" >> $TMP
echo "==============================" >> $TMP
if [ -f "$LOGDIR/${LOG}" ] ; then
if [ -f "$LOGDIR/${LOG}.1" ] ; then
- $SED -e :a -e '$!N;s/\n //;ta' -e 'P;D' ${LOGDIR}/${LOG}.1 $LOGDIR/$LOG | $GREP -si "^$DAY [0-9][0-9:]* $YEAR" >> $TMPLOG
+ $SED -e :a -e '$!N;s/\n //;ta' -e 'P;D' ${LOGDIR}/${LOG}.1 $LOGDIR/$LOG | $GREP -si "^$DAY [0-9][0-9:]* $YEAR" > $TMPLOG
else
- $SED -e :a -e '$!N;s/\n //;ta' -e 'P;D' $LOGDIR/$LOG | $GREP -si "^$DAY [0-9][0-9:]* $YEAR" >> $TMPLOG
+ $SED -e :a -e '$!N;s/\n //;ta' -e 'P;D' $LOGDIR/$LOG | $GREP -si "^$DAY [0-9][0-9:]* $YEAR" > $TMPLOG
fi
if [ "${LOG}" = "post" ] ; then
@@ -406,16 +406,14 @@
for LOG in $ERR_LOGS
do
- $RM -f $TMPLOG
- $TOUCH $TMPLOG
echo "Log file: $LOG" >> $TMP
echo "==============================" >> $TMP
if [ -f "$LOGDIR/${LOG}" ] ; then
if [ -f "$LOGDIR/${LOG}.1" ] ; then
- $GREP -si "^$DAY [0-9][0-9:]* $YEAR" ${LOGDIR}/${LOG}.1 ${LOGDIR}/${LOG} | $SED "s/^[^:]*://" >> $TMPLOG
+ $GREP -si "^$DAY [0-9][0-9:]* $YEAR" ${LOGDIR}/${LOG}.1 ${LOGDIR}/${LOG} | $SED "s/^[^:]*://" > $TMPLOG
else
- $GREP -si "^$DAY [0-9][0-9:]* $YEAR" ${LOGDIR}/${LOG} >> $TMPLOG
+ $GREP -si "^$DAY [0-9][0-9:]* $YEAR" ${LOGDIR}/${LOG} > $TMPLOG
fi
if [ "${LOG}" = "error" ] ; then
@@ -543,9 +541,7 @@
do
if [ -d $DIR ] ; then
- $RM -f $TMPLOG
- $TOUCH $TMPLOG
- $LS -la $DIR >> $TMPLOG
+ $LS -la $DIR > $TMPLOG
LINES=`$WC -l < $TMPLOG`
LINES=`expr $LINES - 3`
@@ -575,9 +571,7 @@
cd $DATADIR
-$RM -f $TMPLOG
-$TOUCH $TMPLOG
-$LS -la | $GREP -i '\.pck$' >> $TMPLOG
+$LS -la | $GREP -i '\.pck$' > $TMPLOG
LINES=`$WC -l < $TMPLOG`
echo "Python pickle files: $LINES" >> $TMP
@@ -605,9 +599,7 @@
if [ -d $SPAMDIR ] ; then
cd $SPAMDIR
- $RM -f $TMPLOG
- $TOUCH $TMPLOG
- $LS -la | $GREP -i '\.msg$' >> $TMPLOG
+ $LS -la | $GREP -i '\.msg$' > $TMPLOG
LINES=`$WC -l < $TMPLOG`
echo "******************************" >> $TMP
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
