summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2001-02-01 08:25:39 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2001-02-01 08:25:39 +0000
commit6d09a84540d7194ab5b7a9351105880739f899e2 (patch)
tree23c43fa7461f838d9aa4f2a38c94738f9e94b597 /mk
parent6cb4974b7390e85dac2c692ac1450cae8266b4b0 (diff)
downloadpkgsrc-6d09a84540d7194ab5b7a9351105880739f899e2.tar.gz
- when deleting packages, don't try and delete packages which have already
been deleted. - when removing the '.start' file, don't remove them all, only the one we created. Prevents clashes when pkgsrc is shared among multiple machines.
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/pre-build16
1 files changed, 10 insertions, 6 deletions
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index de595a47a0b..b46891e729d 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.9 2000/12/31 17:38:32 dmcmahill Exp $
+# $NetBSD: pre-build,v 1.10 2001/02/01 08:25:39 dmcmahill Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -70,13 +70,17 @@ if [ -d /var/db/pkg ]; then
cd /var/db/pkg
for pkg in *
do
- echo pkg_delete -rR $pkg
- pkg_delete -rR $pkg
+ if `pkg_info -qe $pkg`; then
+ echo pkg_delete -rR $pkg
+ pkg_delete -rR $pkg
+ fi
done
for pkg in *
do
- echo pkg_delete -rR $pkg
- pkg_delete -rR -f $pkg
+ if `pkg_info -qe $pkg`; then
+ echo pkg_delete -rR $pkg
+ pkg_delete -rR -f $pkg
+ fi
done
# We've tried our best to get rid of the pkgs, now do it the hard way
@@ -104,7 +108,7 @@ rm -fr /nonexistant # broken useradd on pop3d
cd ${USR_PKGSRC}
rm -f $BROKENF */*/$BROKENF
rm -f $BLDLOG */*/$BLDLOG
-rm -f .start*
+rm -f .start.${arch}
mount -o noasync -u /usr