diff options
| author | rillig <rillig@pkgsrc.org> | 2020-01-15 20:11:11 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-01-15 20:11:11 +0000 |
| commit | 5831383bbb9bc92a926cb45f64e40c819e5237da (patch) | |
| tree | c201212cc00792312ee307938db9cbbf2197f6cd /regress | |
| parent | 96e96974b4920ef20a09d52a8f40c1280c7581c5 (diff) | |
| download | pkgsrc-5831383bbb9bc92a926cb45f64e40c819e5237da.tar.gz | |
mk/pkgformat: include only relevant ident strings in +BUILD_VERSION
Before, not only files containing an RCS Id were recorded in the
+BUILD_VERSION file but also files containing text that looked similar to
an RCS Id were recorded, even though these didn't contain any valuable
version information.
The effect was that before this change, pkgtools/pkglint was built over
and over again by the bulk builds since pbulk uses a different regular
expression for detecting modified files.
The regular expression for unexpanded RCS Ids is added to record files
that have never been checked in to CVS, just to have them recorded and to
distinguish them from the final committed version.
See https://mail-index.netbsd.org/tech-pkg/2020/01/11/msg022489.html.
Diffstat (limited to 'regress')
3 files changed, 4 insertions, 3 deletions
diff --git a/regress/plus_build_version/files/021-long-name b/regress/plus_build_version/files/021-long-name index 0c969c1657c..8f4af4223f1 100644 --- a/regress/plus_build_version/files/021-long-name +++ b/regress/plus_build_version/files/021-long-name @@ -2,6 +2,7 @@ The RCS Id must be exactly NetBSD, not any longer name that happens to start with NetBSD. Only the exact name is expanded by CVS, therefore recording the other occurrences doesn't make sense. -As of January 2020, this line gets recorded nevertheless. +Before 2020-01-15, this line got unnecessarily recorded in ++BUILD_VERSION. $NetBSDFoundation$ diff --git a/regress/plus_build_version/files/030-missing-colon-or-dollar b/regress/plus_build_version/files/030-missing-colon-or-dollar index b095a93ff27..1f6b216f16a 100644 --- a/regress/plus_build_version/files/030-missing-colon-or-dollar +++ b/regress/plus_build_version/files/030-missing-colon-or-dollar @@ -1,7 +1,7 @@ A complete RCS Id needs a colon or a dollar, otherwise it is not expanded. -As of January 2020, this line gets unnecessarily recorded in +Before 2020-01-15, this line got unnecessarily recorded in +BUILD_VERSION. $NetBSD diff --git a/regress/plus_build_version/files/040-missing-dollar-after-colon b/regress/plus_build_version/files/040-missing-dollar-after-colon index 535cc701fb7..f4816715120 100644 --- a/regress/plus_build_version/files/040-missing-dollar-after-colon +++ b/regress/plus_build_version/files/040-missing-dollar-after-colon @@ -1,7 +1,7 @@ Each RCS Id must end with a second dollar in the same line. Just having the colon is not enough. -As of January 2020, this line gets unnecessarily recorded in +Before 2020-01-15, this line got unnecessarily recorded in +BUILD_VERSION. $NetBSD: |