summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2019-07-29 14:48:17 +0000
committergdt <gdt@pkgsrc.org>2019-07-29 14:48:17 +0000
commit8d113ee7c3d0696dd911866635c49423280f495c (patch)
tree2aec6c6351f233f88c5d2addef527cc652a565e5 /pkgtools
parent425d70981f52c88c48be25cdbb9e2be8e89cf22f (diff)
downloadpkgsrc-8d113ee7c3d0696dd911866635c49423280f495c.tar.gz
pkgtools/pkg_rollingreplace: Update to 0.24.7
When running pkg_chk, ignore packages marked "missing", which tend to be the wrong python version. This is a temporary kludge, but should allow pkg_rr to run on systems that have changed python versions.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_rolling-replace/Makefile4
-rwxr-xr-xpkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index 1d8cfde53d8..144946af239 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2019/04/26 18:14:15 gdt Exp $
+# $NetBSD: Makefile,v 1.44 2019/07/29 14:48:17 gdt Exp $
-PKGNAME= pkg_rolling-replace-0.24.6
+PKGNAME= pkg_rolling-replace-0.24.7
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 7dfd9347746..f45d4400385 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.38 2019/04/26 18:14:15 gdt Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.39 2019/07/29 14:48:17 gdt Exp $
#<license>
# Copyright (c) 2006 BBN Technologies Corp. All rights reserved.
#
@@ -151,7 +151,7 @@ OPC='rr>' # continuation
# supported. Newer versions may or may not work (patches welcome).
check_packages_mismatched()
{
- ${PKG_CHK} -u -q $opt_B | while read line; do
+ ${PKG_CHK} -u -q $opt_B | egrep -v missing | while read line; do
# duplicate output of pkg_chk to stderr (bypass $(...) or `...`)
echo "${OPC} $line" 1>&2
# Look for the first thing that looks like pkg-version rather