d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we are using -p it does not make any sense to even create the

Browse Source 
MTREENEW file since it will never be used.
This commit is contained in:
Doug Barton 2009-12-31 04:07:13 +00:00
parent 26fac73c1c
commit 15768c780a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=201323
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/mergemaster/mergemaster.sh
View File

@ -686,9 +686,9 @@ case "${RERUN}" in
find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null
# Build the mtree database in a temporary location.
MTREENEW=`mktemp -t mergemaster.mtree`
case "${PRE_WORLD}" in
'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
'') MTREENEW=`mktemp -t mergemaster.mtree`
mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
;;
*) # We don't want to mess with the mtree database on a pre-world run or
# when re-scanning a previously-built tree.