diff options
| author | rillig <rillig@pkgsrc.org> | 2016-01-12 01:07:37 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2016-01-12 01:07:37 +0000 |
| commit | 2bc793437c1dc918a3f246e21789491b3d1dba52 (patch) | |
| tree | 2b81e9be43b6f08fc55d5355809ee0b5fb715229 /pkgtools | |
| parent | 60dd0b456fa004152374b54c67d0bde05a31f27b (diff) | |
| download | pkgsrc-2bc793437c1dc918a3f246e21789491b3d1dba52.tar.gz | |
Small cleanup after version 5.3
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/mklines_test.go | 2 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/vartypecheck.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/mklines_test.go b/pkgtools/pkglint/files/mklines_test.go index 6061894ec20..40e5fcaf46b 100644 --- a/pkgtools/pkglint/files/mklines_test.go +++ b/pkgtools/pkglint/files/mklines_test.go @@ -25,7 +25,7 @@ func (s *Suite) TestMkLines_AutofixConditionalIndentation(c *check.C) { "AUTOFIX: ~/fname.mk:6: Replacing \".\" with \". \".\n"+ "AUTOFIX: ~/fname.mk: Has been auto-fixed. Please re-run pkglint.\n") c.Check(s.LoadTmpFile(c, "fname.mk"), equals, ""+ - "# $NetBSD: mklines_test.go,v 1.1 2016/01/12 01:02:49 rillig Exp $\n"+ + "# $"+"NetBSD$\n"+ ".if defined(A)\n"+ ". for a in ${A}\n"+ ". if defined(C)\n"+ diff --git a/pkgtools/pkglint/files/vartypecheck.go b/pkgtools/pkglint/files/vartypecheck.go index f37269ed01f..defc1ca3b55 100644 --- a/pkgtools/pkglint/files/vartypecheck.go +++ b/pkgtools/pkglint/files/vartypecheck.go @@ -242,7 +242,7 @@ func (cv *VartypeCheck) EmulPlatform() { if m, opsys, arch := match2(cv.value, `^(\w+)-(\w+)$`); m { if !matches(opsys, `^(?:bitrig|bsdos|cygwin|darwin|dragonfly|freebsd|haiku|hpux|interix|irix|linux|mirbsd|netbsd|openbsd|osf1|sunos|solaris)$`) { - cv.line.Warnf("Unknown operating system: %s", opsys) + cv.line.Warn1("Unknown operating system: %s", opsys) } // no check for os_version if !matches(arch, `^(?:i386|alpha|amd64|arc|arm|arm32|cobalt|convex|dreamcast|hpcmips|hpcsh|hppa|ia64|m68k|m88k|mips|mips64|mipsel|mipseb|mipsn32|ns32k|pc532|pmax|powerpc|rs6000|s390|sparc|sparc64|vax|x86_64)$`) { @@ -520,7 +520,7 @@ func (cv *VartypeCheck) PlatformTriple() { reTriple := `^(` + rePart + `)-(` + rePart + `)-(` + rePart + `)$` if m, opsys, _, arch := match3(cv.value, reTriple); m { if !matches(opsys, `^(?:\*|Bitrig|BSDOS|Cygwin|Darwin|DragonFly|FreeBSD|Haiku|HPUX|Interix|IRIX|Linux|MirBSD|NetBSD|OpenBSD|OSF1|QNX|SunOS)$`) { - cv.line.Warnf("Unknown operating system: %s", opsys) + cv.line.Warn1("Unknown operating system: %s", opsys) } // no check for os_version if !matches(arch, `^(?:\*|i386|alpha|amd64|arc|arm|arm32|cobalt|convex|dreamcast|hpcmips|hpcsh|hppa|ia64|m68k|m88k|mips|mips64|mipsel|mipseb|mipsn32|ns32k|pc532|pmax|powerpc|rs6000|s390|sparc|sparc64|vax|x86_64)$`) { |