diff options
| author | gdt <gdt@pkgsrc.org> | 2018-05-06 18:06:18 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2018-05-06 18:06:18 +0000 |
| commit | b798757fd647e2db9e969dcf8bcba440c5624322 (patch) | |
| tree | b9facb26c3cae931cd522b3e9752adeab2f9d052 /pkgtools/pkg_rolling-replace | |
| parent | dccbb84d5f91262159825cd781571d5dc7d8035b (diff) | |
| download | pkgsrc-b798757fd647e2db9e969dcf8bcba440c5624322.tar.gz | |
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 (limited to 'pkgtools/pkg_rolling-replace')
| -rw-r--r-- | pkgtools/pkg_rolling-replace/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile index b4da3902da3..38ffd6353c5 100644 --- a/pkgtools/pkg_rolling-replace/Makefile +++ b/pkgtools/pkg_rolling-replace/Makefile @@ -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 diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index af27ee65707..378c8996801 100755 --- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh +++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh @@ -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 |