diff options
| author | jlam <jlam> | 2003-08-31 06:39:36 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-31 06:39:36 +0000 |
| commit | 7aed0125637a21c5088326eb6303201b170a00cf (patch) | |
| tree | abb8a5bc9cef0908d319cc6896373c8adecdcd42 | |
| parent | 9a13a028bd99ba4de1d587cf08888bb40d6130ad (diff) | |
| download | pkgsrc-7aed0125637a21c5088326eb6303201b170a00cf.tar.gz | |
Actually, make sure that we don't try to remove broken packages on the
first time around.
| -rw-r--r-- | mk/bulk/pre-build | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build index 25a497de394..1ba2b998aa8 100644 --- a/mk/bulk/pre-build +++ b/mk/bulk/pre-build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: pre-build,v 1.27.2.4 2003/08/31 06:37:16 jlam Exp $ +# $NetBSD: pre-build,v 1.27.2.5 2003/08/31 06:39:36 jlam Exp $ # # Clean up system to be ready for bulk pkg build # @@ -79,18 +79,21 @@ if [ -d ${PKG_DBDIR} ]; then do case "${DEPOTBASE}" in "${PKG_DBDIR}") + if `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then + echo pkg_delete -r $pkg + pkg_delete -K ${PKG_DBDIR} -r $pkg + fi ;; *) if `pkg_info -K ${DEPOTBASE} -qe $pkg`; then echo pkg_delete -r $pkg pkg_delete -K ${DEPOTBASE} -r $pkg + elif `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then + echo pkg_delete -r $pkg + pkg_delete -K ${PKG_DBDIR} -r $pkg fi ;; esac - if `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then - echo pkg_delete -r $pkg - pkg_delete -K ${PKG_DBDIR} -r $pkg - fi done # this should have removed everything. Now force any broken pkgs # to deinstall @@ -98,18 +101,21 @@ if [ -d ${PKG_DBDIR} ]; then do case "${DEPOTBASE}" in "${PKG_DBDIR}") + if `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then + echo pkg_delete -f $pkg + pkg_delete -K ${PKG_DBDIR} -f $pkg + fi ;; *) if `pkg_info -K ${DEPOTBASE} -qe $pkg`; then echo pkg_delete -f $pkg pkg_delete -K ${DEPOTBASE} -f $pkg + elif `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then + echo pkg_delete -f $pkg + pkg_delete -K ${PKG_DBDIR} -f $pkg fi ;; esac - if `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then - echo pkg_delete -f $pkg - pkg_delete -K ${PKG_DBDIR} -f $pkg - fi done # We've tried our best to get rid of the pkgs, now do it the hard way |