pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files As I don't know how many backsl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b591111f350
branches:  trunk
changeset: 501964:0b591111f350
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 01 00:26:35 2005 +0000

description:
As I don't know how many backslashes are needed inside backticks to make
one backslash reach the argument to sed(1), the backticks are replaced
with a call to open("... |"). Now the first argument to sed(1) contains
\$ instead of a simple $.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r b2cab26d5ea7 -r 0b591111f350 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue Nov 01 00:23:21 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue Nov 01 00:26:35 2005 +0000
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.311 2005/10/30 23:09:40 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.312 2005/11/01 00:26:35 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -913,8 +913,10 @@
 
                if ($file =~ /^patch-[A-Za-z0-9]+$/) {
                        if (-f "${dir}/${patchdir}/${file}") {
-                               my $chksum = `sed -e '/\$NetBSD.*/d' $dir/$patchdir/$file | digest $alg`;
-                               $chksum =~ s/\r*\n*\z//;
+                               open(DIG, "sed '/\\\$NetBSD.*/d' ${dir}/${patchdir}/${file} | digest ${alg} |") or die;
+                               my $chksum = <DIG>;
+                               close(DIG);
+                               chomp($chksum);
                                if ($sum ne $chksum) {
                                        $line->log_error("${alg} checksum of $file differs (expected ${sum}, got ${chksum}). Rerun '$conf_make makepatchsum'.");
                                }



Home | Main Index | Thread Index | Old Index