On Fri, 23 Mar 2018 15:33:38 +0100, gregor herrmann wrote: > I tried the same for Vcs-Git and got interesting errors, but they > also appear with Vcs-Browser: > > If I add > > [ 'Vcs-Browser', 'http://anonscm.debian.org/cgit/foo-team/bar.git','', $expected_warn ], > > to the @vcs_tests array in t/dependency-check.t, I get > > # Failed test 'fixed Vcs-Browser URL' > # at t/dependency-check.t line 478. > # got: 'https://salsa.debian.org/perl-team/modules/packages/libdist-zilla-plugins-cjm-perl' > # expected: '' > > Looks like the "old" value is still there somehow? I've pushed some commits re Vcs-Git and a test for the fixup mechanism to a branch gregoa/nomorealioth. Unfortunately the tests in t/dependency-check.t still fails, as decribed above. I guess we also need a change for the other Vcs-* fields. I've played a bit with ideas like @@ -437,13 +437,11 @@ The information is meant to be useful for a user knowledgeable in the given Vers 'summary' => 'URL of the VCS repository', 'type' => 'leaf', 'value_type' => 'uniline', - 'warn_unless' => { - 'debian-uri' => { - 'code' => '!defined $_ or ! /debian.org/ or m{^https?://anonscm.debian.org/arch} ;', - 'fix' => 's!https?://[\\w\\.-]+/(arch/)*!https://anonscm.debian.org/arch/!;', - 'msg' => 'URL is not the canonical one for repositories hosted on Debian infrastructure.' + 'warn_if_match' => { + '(?:alioth|arch|anonscm)\.debian\.org' => { + 'msg' => 'URL points to old Debian infrastructure.' } - } + }, }, 'Vcs-Bzr', { but maybe we need to unset the value as well with a "fix => $_ = undef" here? Cheers, gregor -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `- NP: Andrew Lloyd Webber & Tim Rice: Gethsemane (I Only Want To Say)
Attachment:
signature.asc
Description: Digital Signature