diff options
| author | joerg <joerg@pkgsrc.org> | 2015-12-25 20:13:18 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-12-25 20:13:18 +0000 |
| commit | f166615ad2f797e9ac469bbe8864dd9742c4abb8 (patch) | |
| tree | b7f9463456bdf2a225b608413eef872962914c7b /pkgtools | |
| parent | 17094d7b6918ab90d67481106ea35137bec887ce (diff) | |
| download | pkgsrc-f166615ad2f797e9ac469bbe8864dd9742c4abb8.tar.gz | |
Avoid matching RCS ID patterns.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/distinfo.go | 2 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/distinfo.go b/pkgtools/pkglint/files/distinfo.go index c9630552c1c..7f280e674c6 100644 --- a/pkgtools/pkglint/files/distinfo.go +++ b/pkgtools/pkglint/files/distinfo.go @@ -94,7 +94,7 @@ func (ck *distinfoLinesChecker) checkPatchSha1(line *Line, patchFname, distinfoS } h := sha1.New() - netbsd := []byte("$NetBSD") + netbsd := []byte("$" + "NetBSD") for _, patchLine := range bytes.SplitAfter(patchBytes, []byte("\n")) { if !bytes.Contains(patchLine, netbsd) { h.Write(patchLine) diff --git a/pkgtools/pkglint/files/pkglint.go b/pkgtools/pkglint/files/pkglint.go index 8c024c1ebb2..11dcf5be567 100644 --- a/pkgtools/pkglint/files/pkglint.go +++ b/pkgtools/pkglint/files/pkglint.go @@ -281,7 +281,7 @@ func checklineTrailingWhitespace(line *Line) { func checklineRcsid(line *Line, prefixRe, suggestedPrefix string) bool { defer tracecall("checklineRcsid", prefixRe, suggestedPrefix)() - if !matches(line.text, `^`+prefixRe+`\$NetBSD(?::[^\$]+)?\$$`) { + if !matches(line.text, `^`+prefixRe+`[$]NetBSD(?::[^\$]+)?\$$`) { line.errorf("Expected %q.", suggestedPrefix+"$"+"NetBSD$") line.explain( "Several files in pkgsrc must contain the CVS Id, so that their current", |