diff options
| author | abs <abs@pkgsrc.org> | 2007-04-16 18:42:21 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2007-04-16 18:42:21 +0000 |
| commit | 5588e341aaebaff99b7f330ccbdda3e74aece2a1 (patch) | |
| tree | 5ead92010a32dc7f8b68f238df1e1ea27a02def8 | |
| parent | a2bd6f73fca7faa43033c0cbee50966617f160d9 (diff) | |
| download | pkgsrc-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.
| -rw-r--r-- | doc/CHANGES-2007 | 3 | ||||
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007 index b7572d3d830..8e2fccf4d9b 100644 --- a/doc/CHANGES-2007 +++ b/doc/CHANGES-2007 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2007,v 1.852 2007/04/16 16:12:19 ghen Exp $ +$NetBSD: CHANGES-2007,v 1.853 2007/04/16 18:42:48 abs Exp $ Changes to the packages collection and infrastructure in 2007: @@ -1656,3 +1656,4 @@ Changes to the packages collection and infrastructure in 2007: Updated sysutils/bacula-gnome-console to 2.0.3 [ghen 2007-04-16] Updated sysutils/bacula-tray-monitor to 2.0.3 [ghen 2007-04-16] Updated sysutils/bacula-wx-console to 2.0.3 [ghen 2007-04-16] + Updated pkgtools/pkg_chk to 1.85 [abs 2007-04-16] 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 |