summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_chk
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2007-04-16 18:42:21 +0000
committerabs <abs@pkgsrc.org>2007-04-16 18:42:21 +0000
commit5588e341aaebaff99b7f330ccbdda3e74aece2a1 (patch)
tree5ead92010a32dc7f8b68f238df1e1ea27a02def8 /pkgtools/pkg_chk
parenta2bd6f73fca7faa43033c0cbee50966617f160d9 (diff)
downloadpkgsrc-5588e341aaebaff99b7f330ccbdda3e74aece2a1.tar.gz
Update pkgtools/pkg_chk to 1.85:
Add a missing FAIL= to the start of pkg_install(), the absence of which would cause a package which had been "previously installed" to pick up the last value of FAIL (and sometimes be incorrectly marked as failed). Thanks to Martin Weber for the diagnosis.
Diffstat (limited to 'pkgtools/pkg_chk')
-rw-r--r--pkgtools/pkg_chk/Makefile4
-rwxr-xr-xpkgtools/pkg_chk/files/pkg_chk.sh3
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index ddb5879ce71..52a42aefd19 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2007/04/15 21:34:49 abs Exp $
+# $NetBSD: Makefile,v 1.48 2007/04/16 18:42:21 abs Exp $
-DISTNAME= pkg_chk-1.84
+DISTNAME= pkg_chk-1.85
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh
index 9537a55e0a0..bef71827819 100755
--- a/pkgtools/pkg_chk/files/pkg_chk.sh
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh
@@ -1,6 +1,6 @@
#!@SH@ -e
#
-# $Id: pkg_chk.sh,v 1.45 2007/04/15 21:34:49 abs Exp $
+# $Id: pkg_chk.sh,v 1.46 2007/04/16 18:42:21 abs Exp $
#
# TODO: Make -g check dependencies and tsort
# TODO: Variation of -g which only lists top level packages
@@ -484,6 +484,7 @@ pkg_install()
PKGDIR=$2
INSTALL=$3
+ FAIL=
if [ -d $PKG_DBDIR/$PKGNAME ];then
msg "$PKGNAME installed in previous stage"
elif [ -n "$opt_b" ] && is_binary_available $PKGNAME; then