tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Issues with using python37



I think the fix I just committed (that I asked you to test) is wrong.
Please try the following diff (to what's committed), which was written
hurriedly and has not been tested.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_rolling-replace/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile	26 Apr 2019 18:14:15 -0000	1.43
+++ Makefile	26 Apr 2019 18:16:23 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.43 2019/04/26 18:14:15 gdt Exp $
 
-PKGNAME=	pkg_rolling-replace-0.24.6
+PKGNAME=	pkg_rolling-replace-0.24.7
 CATEGORIES=	pkgtools
 
 MAINTAINER=	gdt%NetBSD.org@localhost
Index: files/pkg_rolling-replace.sh
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh,v
retrieving revision 1.38
diff -u -p -r1.38 pkg_rolling-replace.sh
--- files/pkg_rolling-replace.sh	26 Apr 2019 18:14:15 -0000	1.38
+++ files/pkg_rolling-replace.sh	26 Apr 2019 18:16:23 -0000
@@ -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




Home | Main Index | Thread Index | Old Index