CVS commit: pkgsrc/pkgtools/pkglint/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Jul 30 18:31:43 UTC 2019

Modified Files:
        pkgsrc/pkgtools/pkglint/files: pkgsrc.go pkgsrc_test.go

Log Message:
pkgtools/pkglint: fix test for doc/CHANGES removals


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/pkgtools/pkglint/files/pkgsrc.go
cvs rdiff -u -r1.28 -r1.29 pkgsrc/pkgtools/pkglint/files/pkgsrc_test.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkglint/files/pkgsrc.go
diff -u pkgsrc/pkgtools/pkglint/files/pkgsrc.go:1.32 pkgsrc/pkgtools/pkglint/files/pkgsrc.go:1.33
--- pkgsrc/pkgtools/pkglint/files/pkgsrc.go:1.32        Tue Jul 30 18:16:13 2019
+++ pkgsrc/pkgtools/pkglint/files/pkgsrc.go     Tue Jul 30 18:31:43 2019
@@ -613,7 +613,7 @@ func (src *Pkgsrc) loadDocChanges() {
 }
 
 func (src *Pkgsrc) checkRemovedAfterLastFreeze() {
-       if src.LastFreezeStart == "" || G.Wip {
+       if src.LastFreezeStart == "" || G.Wip || !G.Opts.CheckGlobal {
                return
        }
 

Index: pkgsrc/pkgtools/pkglint/files/pkgsrc_test.go
diff -u pkgsrc/pkgtools/pkglint/files/pkgsrc_test.go:1.28 pkgsrc/pkgtools/pkglint/files/pkgsrc_test.go:1.29
--- pkgsrc/pkgtools/pkglint/files/pkgsrc_test.go:1.28   Tue Jul 30 18:16:13 2019
+++ pkgsrc/pkgtools/pkglint/files/pkgsrc_test.go        Tue Jul 30 18:31:43 2019
@@ -277,6 +277,28 @@ func (s *Suite) Test_Pkgsrc_checkRemoved
        t.SetUpPackage("category/still-there")
        t.FinishSetUp()
 
+       // No error message since -Cglobal is not given.
+       t.CheckOutputEmpty()
+}
+
+func (s *Suite) Test_Pkgsrc_checkRemovedAfterLastFreeze__check_global(c *check.C) {
+       t := s.Init(c)
+
+       t.SetUpCommandLine("-Wall", "-Cglobal", "--source")
+       t.CreateFileLines("doc/CHANGES-2019",
+               CvsID,
+               "",
+               "\tUpdated category/updated-before to 1.0 [updater 2019-04-01]",
+               "\tmk/bsd.pkg.mk: started freeze for pkgsrc-2019Q1 branch [freezer 2019-06-21]",
+               "\tmk/bsd.pkg.mk: freeze ended for pkgsrc-2019Q1 branch [freezer 2019-06-25]",
+               "\tUpdated category/updated-after to 1.0 [updater 2019-07-01]",
+               "\tAdded category/added-after version 1.0 [updater 2019-07-01]",
+               "\tMoved category/moved-from to category/moved-to [author 2019-07-02]",
+               "\tDowngraded category/downgraded to 1.0 [author 2019-07-03]",
+               "\tUpdated category/still-there to 1.0 [updater 2019-07-04]")
+       t.SetUpPackage("category/still-there")
+       t.FinishSetUp()
+
        // It doesn't matter whether the last visible package change was before
        // or after the latest freeze. The crucial point is that the most
        // interesting change is the invisible one, which is the removal.