diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2009-12-31 04:07:13 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2009-12-31 04:07:13 +0000 |
| commit | 15768c780ab653f9abe64d098fc2edb303080ad3 (patch) | |
| tree | eb832680689ea1e4ffff8ef2ec1d27423d8a5eed /usr.sbin | |
| parent | 26fac73c1c5a17c67be82041c5df095fcba7b4eb (diff) | |
| download | src-15768c780ab653f9abe64d098fc2edb303080ad3.tar.gz src-15768c780ab653f9abe64d098fc2edb303080ad3.zip | |
If we are using -p it does not make any sense to even create the
MTREENEW file since it will never be used.
Notes
Notes:
svn path=/head/; revision=201323
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 5703bf36e568..acc7b3b2d1c2 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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. |