CVS commit: pkgsrc/pkgtools/pkg_rolling-replace

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Apr 26 18:14:15 UTC 2019

Modified Files:
        pkgsrc/pkgtools/pkg_rolling-replace: Makefile
        pkgsrc/pkgtools/pkg_rolling-replace/files: pkg_rolling-replace.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
cvs rdiff -u -r1.37 -r1.38 \
    pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_rolling-replace/Makefile
diff -u pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.42 pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.43
--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.42   Sat Mar 23 17:20:31 2019
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile        Fri Apr 26 18:14:15 2019
@@ -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

Index: pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
diff -u pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.37 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.38
--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.37       Sat Mar 23 17:20:31 2019
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh    Fri Apr 26 18:14:15 2019
@@ -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