diff options
| author | gdt <gdt@pkgsrc.org> | 2019-04-26 18:14:15 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2019-04-26 18:14:15 +0000 |
| commit | 5de4ca05bf0150b9bd8e19372e7b8d57741e7356 (patch) | |
| tree | c5159277b38c3474ac3d1827983c52febbaeb524 /pkgtools | |
| parent | 23e3434a02c48d9b44292df200333db9f2218c4c (diff) | |
| download | pkgsrc-5de4ca05bf0150b9bd8e19372e7b8d57741e7356.tar.gz | |
pkg_rolling-replace: Update to 0.24.6
When trying to extract PKGPATH from what is believed to be the PKGNAME
of an installed package, do not abort, but merely error (which is
nonfatal with -k). This is helpful, but not sufficient, when dealing
with pyNN-foo packages where the default version is depended on but
not installed.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_rolling-replace/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile index 6d7bc531ca8..1d8cfde53d8 100644 --- a/pkgtools/pkg_rolling-replace/Makefile +++ b/pkgtools/pkg_rolling-replace/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.42 2019/03/23 17:20:31 gdt Exp $ +# $NetBSD: Makefile,v 1.43 2019/04/26 18:14:15 gdt Exp $ -PKGNAME= pkg_rolling-replace-0.24.5 +PKGNAME= pkg_rolling-replace-0.24.6 CATEGORIES= pkgtools MAINTAINER= gdt@NetBSD.org diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index 649a6da3c05..7dfd9347746 100755 --- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh +++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: pkg_rolling-replace.sh,v 1.37 2019/03/23 17:20:31 gdt Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.38 2019/04/26 18:14:15 gdt Exp $ #<license> # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -419,7 +419,7 @@ while [ -n "$REPLACE_TODO" ]; do for pkg in $TSORTED; do if is_member $pkg $REPLACE_TODO; then pkgdir=$(${PKG_INFO} -Q PKGPATH $pkg) - [ -n "$pkgdir" ] || abort "Couldn't extract PKGPATH from installed package $pkg" + [ -n "$pkgdir" ] || error "Couldn't extract PKGPATH from installed package $pkg" break; fi done |