In the following scenario:

1. Start mergemaster
2. Interrupt it
3. < Somehow the temproot directory disappears >
4. mergemaster -r
Many bad things can happen, especially if the -i option is in use.

Therefore, add a check to make sure it still exists before we start
comparing files.

Brought to my attention by:
PR:		bin/40538
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>
This commit is contained in:
Doug Barton 2007-12-21 19:34:26 +00:00
parent 69296991a2
commit f29fe35ae8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=174841

View File

@ -838,6 +838,13 @@ mm_install () {
return $?
}
if [ ! -d "${TEMPROOT}" ]; then
echo "*** FATAL ERROR: The temproot directory (${TEMPROOT})"
echo ' has disappeared!'
echo ''
exit 1
fi
echo ''
echo "*** Beginning comparison"
echo ''