diff options
| author | joerg <joerg> | 2015-09-08 17:33:26 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-09-08 17:33:26 +0000 |
| commit | b8f538aac62a788dd24e4205f0de88045c710c05 (patch) | |
| tree | 1f6c33b15f7b8b9db6a72abfbcad6a58d9dd2485 /pkgtools | |
| parent | 011774d83928a88728a325e62e2863096fe1aa7e (diff) | |
| download | pkgsrc-b8f538aac62a788dd24e4205f0de88045c710c05.tar.gz | |
Allow having bulklog and bulklog.old as separate mount points.
When removing bulklog.old fails, try to remove everything but meta and
copy the content.
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pre-build | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgtools/pbulk/files/pbulk/scripts/pre-build b/pkgtools/pbulk/files/pbulk/scripts/pre-build index c088cfde5f9..1436aabd926 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pre-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pre-build @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pre-build,v 1.12 2015/07/25 15:14:54 sevan Exp $ +# $NetBSD: pre-build,v 1.13 2015/09/08 17:33:26 joerg Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -65,8 +65,15 @@ if [ -d "${bulklog}/meta" ]; then sleep 5 if [ "${reuse_scan_results}" = yes -a -f "${bulklog}/meta/pscan" ]; then echo "Reusing old scan results" - rm -rf "${bulklog}.old" - mv "${bulklog}" "${bulklog}.old" + rm -rf "${bulklog}.old" 2> /dev/null || true + if [ -d "${bulklog}.old" ]; then + rm -rf "${bulklog}.old"/* || true + find "${bulklog}" -maxdepth 1 -mindepth 1 ! -name meta -exec rm -rf {} \; || true + cp -r "${bulklog}/." "${bulklog}.old/" + rm -rf "${bulklog}"/* || true + else + mv "${bulklog}" "${bulklog}.old" + fi else echo "Removing old scan results" rm -rf "${bulklog}"/* || true |