From 0c58eca24c7b2730905aef25049cef0a592ac73f Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Mon, 16 Apr 2007 18:42:21 +0000
Subject: 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.

---
 pkgtools/pkg_chk/Makefile         | 4 ++--
 pkgtools/pkg_chk/files/pkg_chk.sh | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgtools/pkg_chk')

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
-- 
cgit v1.2.3