diff options
| author | joerg <joerg@pkgsrc.org> | 2009-12-16 19:41:41 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-12-16 19:41:41 +0000 |
| commit | f50628932c7f2e64d049ba678c6e77d9973e985a (patch) | |
| tree | 9328bf2d0328da6c7f3985982e4065bf78ff83ce /pkgtools | |
| parent | 651b7d7e08ba1ce9232058df60650e2942a4db46 (diff) | |
| download | pkgsrc-f50628932c7f2e64d049ba678c6e77d9973e985a.tar.gz | |
pbulk-0.43:
Remove the content of bulklog, not the directory. Much nicer if nullfs
is used. Log error output of pscan.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pre-build | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/scan | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index a5bb728fcfb..6dde690bcb3 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2009/10/25 23:08:02 joerg Exp $ +# $NetBSD: Makefile,v 1.57 2009/12/16 19:41:41 joerg Exp $ -DISTNAME= pbulk-0.42 +DISTNAME= pbulk-0.43 COMMENT= Modular bulk build framework PKG_DESTDIR_SUPPORT= user-destdir diff --git a/pkgtools/pbulk/files/pbulk/scripts/pre-build b/pkgtools/pbulk/files/pbulk/scripts/pre-build index 9c9b1370345..ec3afa7493c 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.9 2008/09/16 18:21:30 joerg Exp $ +# $NetBSD: pre-build,v 1.10 2009/12/16 19:41:41 joerg Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -65,7 +65,7 @@ if [ -d "${bulklog}/meta" ]; then sleep 5 fi -rm -rf "${bulklog}" || true +rm -rf "${bulklog}"/* || true mkdir -p "${bulklog}" "${loc}" @PREFIX@/libexec/pbulk/client-clean diff --git a/pkgtools/pbulk/files/pbulk/scripts/scan b/pkgtools/pbulk/files/pbulk/scripts/scan index 3707314bb98..80ebd3f0be0 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/scan +++ b/pkgtools/pbulk/files/pbulk/scripts/scan @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: scan,v 1.4 2008/09/16 18:21:30 joerg Exp $ +# $NetBSD: scan,v 1.5 2009/12/16 19:41:41 joerg Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -44,10 +44,11 @@ if [ -z "${limited_list}" ]; then echo "Scanning..." case "${master_mode}" in [nN][oO]) - ${pscan} -v -M ${make} ${pkgsrc} ${loc}/pscan + ${pscan} -v -M ${make} ${pkgsrc} ${loc}/pscan 2>> ${loc}/pscan.stderr ;; [yY][eE][sS]) ${pscan} -v -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan + ${pscan} -v -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan 2>> ${loc}/pscan.stderr ;; *) echo "master_mode must be either yes or no." |