Received: by mail.netbsd.org (Postfix, from userid 605) id B080E84DC1; Thu, 22 Apr 2021 08:54:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E6B6384DB3 for ; Thu, 22 Apr 2021 08:54:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id SqzJRVpJDS52 for ; Thu, 22 Apr 2021 08:54:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6B0F784D24 for ; Thu, 22 Apr 2021 08:54:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6442BFA95; Thu, 22 Apr 2021 08:54:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1619081658262440" MIME-Version: 1.0 Date: Thu, 22 Apr 2021 08:54:18 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/pkgtools/pkg_rolling-replace To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20210422085418.6442BFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1619081658262440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Thu Apr 22 08:54:18 UTC 2021 Modified Files: pkgsrc/pkgtools/pkg_rolling-replace: Makefile pkgsrc/pkgtools/pkg_rolling-replace/files: pkg_rolling-replace.sh Log Message: Correct the order of redirection To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 pkgsrc/pkgtools/pkg_rolling-replace/Makefile cvs rdiff -u -r1.43 -r1.44 \ 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. --_----------=_1619081658262440 Content-Disposition: inline Content-Length: 1764 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/pkg_rolling-replace/Makefile diff -u pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.48 pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.49 --- pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.48 Tue Apr 13 17:51:21 2021 +++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile Thu Apr 22 08:54:18 2021 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.48 2021/04/13 17:51:21 rhialto Exp $ +# $NetBSD: Makefile,v 1.49 2021/04/22 08:54:18 pho Exp $ -PKGNAME= pkg_rolling-replace-0.24.11 +PKGNAME= pkg_rolling-replace-0.24.12 CATEGORIES= pkgtools MAINTAINER= gdt@NetBSD.org Index: pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh diff -u pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.43 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.44 --- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.43 Tue Apr 13 17:51:21 2021 +++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Thu Apr 22 08:54:18 2021 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: pkg_rolling-replace.sh,v 1.43 2021/04/13 17:51:21 rhialto Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.44 2021/04/22 08:54:18 pho Exp $ # # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -162,7 +162,7 @@ check_packages_mismatched() for word in $line; do if [ "$(echo $word | egrep '^[^/]+-[0-9][^-/]*$')" ]; then if [ -z "$opt_F" ]; then - ${PKG_ADMIN} set mismatch=YES "$word" 2>&1 >/dev/null || { + ${PKG_ADMIN} set mismatch=YES "$word" >/dev/null 2>&1 || { if [ -z "$warned_once" ]; then echo 1>&2 "$OPC WARNING: mismatch variable not set due to permissions;" echo 1>&2 "$OPC mismatch status will not persist." --_----------=_1619081658262440--