CVS commit: pkgsrc/pkgtools/pkg_rolling-replace

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 27 19:30:36 UTC 2019

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
cvs rdiff -u -r1.39 -r1.40 \
    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.44 pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.45
--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.44   Mon Jul 29 14:48:17 2019
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile        Tue Aug 27 19:30:36 2019
@@ -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

Index: pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
diff -u pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.39 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.40
--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.39       Mon Jul 29 14:48:17 2019
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh    Tue Aug 27 19:30:36 2019
@@ -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 @@ 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" ] || 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