CVS commit: pkgsrc/pkgtools/pkg_rolling-replace

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun May  6 18:06:18 UTC 2018

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
cvs rdiff -u -r1.35 -r1.36 \
    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.40 pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.41
--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.40   Sat Apr  7 11:04:30 2018
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile        Sun May  6 18:06:18 2018
@@ -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

Index: pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
diff -u pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.35 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.36
--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.35       Tue Apr 14 11:40:31 2015
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh    Sun May  6 18:06:18 2018
@@ -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 @@ while [ -n "$REPLACE_TODO" ]; do
     if [ -d "$PKGSRCDIR/$pkgdir" ]; then
        cd "$PKGSRCDIR/$pkgdir";
     else
+       fail=1
         mark_as_failed $pkg
        error "No package directory '$pkgdir' for $pkg."
     fi