diff options
| author | dougb <dougb@FreeBSD.org> | 2002-08-05 08:47:52 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-08-05 08:47:52 +0000 |
| commit | 14e8a8cb747ee8bcc3662682ff9fba8068c83e95 (patch) | |
| tree | 2c6e2b3791491b52ab4eaeee02d5fdadcf5279e5 /usr.sbin/mergemaster/mergemaster.sh | |
| parent | cd51ebdaaf88dcfed43c8c87d7c56644c62fa7db (diff) | |
| download | FreeBSD-src-14e8a8cb747ee8bcc3662682ff9fba8068c83e95.zip FreeBSD-src-14e8a8cb747ee8bcc3662682ff9fba8068c83e95.tar.gz | |
Suppress spurious warning messages about rm -rf TEMPROOT failing
before chflags, and exit non-zero if the old TEMPROOT dir
can't be deleted for whatever reason.
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.sh')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 6fdcd02..7fcd93c 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -398,9 +398,9 @@ fi CVS_ID_TAG=FreeBSD delete_temproot () { - rm -rf "${TEMPROOT}" - chflags -R 0 "${TEMPROOT}" - rm -rf "${TEMPROOT}" + rm -rf "${TEMPROOT}" 2>/dev/null + chflags -R 0 "${TEMPROOT}" 2>/dev/null + rm -rf "${TEMPROOT}" || exit 1 } case "${RERUN}" in |
