[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_rolling-replace pkg_rolling-replace: Upda...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d732a53cda09
branches:  trunk
changeset: 322692:d732a53cda09
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Fri Apr 26 18:14:15 2019 +0000

description:
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:

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

diffs (32 lines):

diff -r 8730e6d56e7d -r d732a53cda09 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Fri Apr 26 17:06:21 2019 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Fri Apr 26 18:14:15 2019 +0000
@@ -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@localhost
diff -r 8730e6d56e7d -r d732a53cda09 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Fri Apr 26 17:06:21 2019 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Fri Apr 26 18:14:15 2019 +0000
@@ -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 @@
     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