bin/188485: mergemaster -p fails with "/var/tmp/temproot suddenly disappeared"

[David Boyd]

>Number:         188485
>Category:       bin
>Synopsis:       mergemaster -p fails with "/var/tmp/temproot suddenly disappeared"
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 11 22:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     David Boyd
>Release:        10.0-RELEASE-p1
>Organization:
Boyd Consulting Services, LLC
>Environment:
amd64 10.0-RELEASE-p1
>Description:
mergemaster -p fails with message "/var/tmp/temproot suddenly disappeared"

mergemaster issues "find -d ${TEMPROOT} -type d -empty -delete 2> /dev/null" to delete directories under TEMPROOT (defaults to /var/tmp/temproot).

For 10.0-RELEASE this results in temproot being removed.

For earlier releases a warning message about relative paths is redirected to /dev/null but the directory remains.

>How-To-Repeat:
mkdir -p /var/tmp/temproot

ls -ldT /var/tmp/temproot

find -d /var/tmp/temproot -type d -empty -delete

ls -ldT /var/tmp/temproot
>Fix:
in mergemaster near line number 711:

replace: find -d ${TEMPROOT} -type d -empty -delete 2> /dev/null

   with: find -d ${TEMPROOT} -type d -empty -mindepth 1 -delete 2> /dev/null

This solution is discussed in r253886 to find.

>Release-Note:
>Audit-Trail:
>Unformatted: