diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-08-19 14:01:49 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-08-19 14:01:49 +0000 |
| commit | 702a42e004ab40c26cc3f682de4c97b07b2a20bc (patch) | |
| tree | bd7ca5ea615e0f676fc5fb39a2694d219aab2e9c | |
| parent | Update to 0.11.2. (diff) | |
Mk/bsd.sites.mk: Fix fetch with GL_TUPLE site:account:project:commit:group style entries
Something like
GL_TUPLE= https://gitlab.redox-os.org:redox-os:calc:afba9c5d184ddb9db5e4e71dc357da0499e212cf:calculate
fails to fetch because GL_SITE_calculate still has the colon left after parsing:
=> Attempting to fetch https://gitlab.redox-os.org:/redox-os/calc/repository/afba9c5d184ddb9db5e4e71dc357da0499e212cf/archive.tar.gz?dummy=/redox-os-calc-afba9c5d184ddb9db5e4e71dc357da0499e212cf_GL0.tar.gz
fetch: https://gitlab.redox-os.org:/redox-os/calc/repository/afba9c5d184ddb9db5e4e71dc357da0499e212cf/archive.tar.gz?dummy=/redox-os-calc-afba9c5d184ddb9db5e4e71dc357da0499e212cf_GL0.tar.gz: parse error
$ make -V GL_SITE_calculate
https://gitlab.redox-os.org:
Changing the already complex regular expressions to correct this
would make them even more complex. Instead we correct the :: that
appears in GL_SITE after parsing GL_TUPLE.
Approved by: portmgr (mat)
Differential Revision: https://reviews.freebsd.org/D21171
| -rw-r--r-- | Mk/bsd.sites.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 8dfc50ddd609..946614fdcedd 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -544,7 +544,7 @@ check-makevars:: @${FALSE} . endif . endfor -GL_SITE+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\1\8@} +GL_SITE+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\1\8@:S@::@:@} GL_ACCOUNT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\5\8@} GL_PROJECT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\6\8@} GL_COMMIT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7\8@} |