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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6dee4a48b589
branches:  trunk
changeset: 307446:6dee4a48b589
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sun May 06 18:06:18 2018 +0000
description:
pkg_rolling-replace: avoid top-level make clean

In some cases, if an installed package's source directory did not
exist, pkg_rr could invoke "make clean" at top-level of pkgsrc.  Bug
report and fix by Andreas Gustafsson in PR pkg/53157.

diffstat:

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

diffs (31 lines):

diff -r 018ec72ba908 -r 6dee4a48b589 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Sun May 06 17:50:47 2018 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Sun May 06 18:06:18 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2018/04/07 11:04:30 gson Exp $
+# $NetBSD: Makefile,v 1.41 2018/05/06 18:06:18 gdt Exp $
 
-PKGNAME=       pkg_rolling-replace-0.24.3
+PKGNAME=       pkg_rolling-replace-0.24.4
 CATEGORIES=    pkgtools
 
 MAINTAINER=    gdt%NetBSD.org@localhost
diff -r 018ec72ba908 -r 6dee4a48b589 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Sun May 06 17:50:47 2018 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Sun May 06 18:06:18 2018 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.35 2015/04/14 11:40:31 wiz Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.36 2018/05/06 18:06:18 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -496,6 +496,7 @@
     if [ -d "$PKGSRCDIR/$pkgdir" ]; then
        cd "$PKGSRCDIR/$pkgdir";
     else
+       fail=1
         mark_as_failed $pkg
        error "No package directory '$pkgdir' for $pkg."
     fi