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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/918cd0e88038
branches:  trunk
changeset: 338577:918cd0e88038
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Tue Aug 27 19:30:36 2019 +0000

description:
pkgtools/pkg_rolling-replace: Update to 0.24.8

Be more tolerant of not finding PKGPATH, and basically attempt to skip
the package rather than treating it as a fatal error.  (This was a
stray edit that I've been running with for a while.)

diffstat:

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

diffs (37 lines):

diff -r 6981e3c721f0 -r 918cd0e88038 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Tue Aug 27 19:24:04 2019 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Tue Aug 27 19:30:36 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2019/07/29 14:48:17 gdt Exp $
+# $NetBSD: Makefile,v 1.45 2019/08/27 19:30:36 gdt Exp $
 
-PKGNAME=       pkg_rolling-replace-0.24.7
+PKGNAME=       pkg_rolling-replace-0.24.8
 CATEGORIES=    pkgtools
 
 MAINTAINER=    gdt%NetBSD.org@localhost
diff -r 6981e3c721f0 -r 918cd0e88038 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Tue Aug 27 19:24:04 2019 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Tue Aug 27 19:30:36 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.39 2019/07/29 14:48:17 gdt Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.40 2019/08/27 19:30:36 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -419,8 +419,11 @@
     for pkg in $TSORTED; do
         if is_member $pkg $REPLACE_TODO; then
            pkgdir=$(${PKG_INFO} -Q PKGPATH $pkg)
-           [ -n "$pkgdir" ] || error "Couldn't extract PKGPATH from installed package $pkg"
-            break;
+           if [ -n "$pkgdir" ]; then
+               break;
+           else
+               error "Couldn't extract PKGPATH from installed package $pkg"
+           fi
         fi
     done
     # loop should never exit without selecting a package