[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: updated from cvs-utils--tla--1.0 [libtool--release--2.0--patch-78]
From: |
Gary V. Vaughan |
Subject: |
FYI: updated from cvs-utils--tla--1.0 [libtool--release--2.0--patch-78] |
Date: |
Fri, 19 Nov 2004 16:56:11 +0000 (GMT) |
User-agent: |
mailnotify/0.6 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to branch-2-0 and HEAD.
* looking for address@hidden/libtool--release--2.0--patch-77 to compare with
* comparing to address@hidden/libtool--release--2.0--patch-77
M ChangeLog
M clcommit.m4sh
M config/mailnotify.m4sh
M config/general.m4sh
* modified files
Index: Changelog
from Gary V. Vaughan <address@hidden>
* config/m4general.m4sh, config/mailnotify.m4sh,
clcommit.m4sh: Updated from cvs-utils--tla--1.0 to allow
parallel commits, and use safer tmpfiles.
--- orig/clcommit.m4sh
+++ mod/clcommit.m4sh
@@ -103,10 +103,10 @@
# Locations for important files:
signature_file=
-log_file="${TMPDIR-/tmp}/$progname-$$"
+log_dir="`func_mktempdir`"
+log_file="$log_dir/log"
-$RM "${TMPDIR-/tmp}/$progname"*
-trap '$RM "${log_file}"*; exit $EXIT_FAILURE' 1 2 15
+trap '$RM -r "$log_dir"; exit $EXIT_FAILURE' 1 2 15
set -e
@@ -417,7 +417,7 @@
# func_mailnotify
func_mailnotify ()
{
- notify_file="${log_file}.2"
+ notify_file="${log_dir}/notify"
func_verbose "Mailing commit notification to $sendmail_to"
{
@@ -493,7 +493,7 @@
func_mailnotify
fi
- $RM "${log_file}"*
+ $RM -r "$log_dir"
}
exit $EXIT_SUCCESS
--- orig/config/general.m4sh
+++ mod/config/general.m4sh
@@ -227,12 +227,13 @@
}
-# func_mktempdir
+# func_mktempdir [string]
# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible
+# libtool processes, and avoids race conditions if possible. If
+# given, STRING is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/libtool"
+ my_template="${TMPDIR-/tmp}/${1-$progname}"
if test "$opt_dry_run" = ":"; then
# Return a directory name, but don't create it in dry-run mode
--- orig/config/mailnotify.m4sh
+++ mod/config/mailnotify.m4sh
@@ -58,7 +58,6 @@
# Report bugs to <address@hidden>
-: ${TMPDIR=/tmp}
: ${HOST=`hostname`}
: ${SENDMAIL=sendmail}
@@ -330,8 +329,9 @@
## ----- ##
{
- fname="${TMPDIR}/$PROGRAM$RANDOM-$RANDOM.$$"
- trap 'rm -f "$fname"; exit 1' 1 2 15
+ tmp_dir="`func_mktempdir`"
+ fname="$tmp_dir/mail"
+ trap '$RM -r "$tmp_dir"; exit $EXIT_FAILURE' 1 2 15
# Generate a comma separated list of destination addresses for the
# mail headers:
@@ -372,6 +372,8 @@
else
mv $fname $outputfile || exit $EXIT_FAILURE
fi
+
+ $RM -r "$tmp_dir"
}
exit $EXIT_SUCCESS
- --
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFBniWqFRMICSmD1gYRAoFiAKCG4GhfzSFO69l0jYUt2XS2FdoG8wCghPyZ
SDSZ+WHWbLCSuujN3Qg+orU=
=Z4+j
-----END PGP SIGNATURE-----
- FYI: updated from cvs-utils--tla--1.0 [libtool--release--2.0--patch-78],
Gary V. Vaughan <=