svn: Fix regex used for old login scheme detection.

The previous version worked on modules that had *no* user (a setup most
of mine had as the user was set in the ssh config).

For modules with a user set the trailing '@' was included in the uid
which make the check fail even when the module was correct. (Though I
had thought I had tested this case with other modules).
wilder
Michael Pyne 13 years ago
parent 005db0400a
commit c3bc40654d
  1. 2
      modules/ksb/Updater/Svn.pm

@ -246,7 +246,7 @@ EOF
else { # The two URLs match, but are they *right*? Things changed June 2013
my ($uid, $url);
# uid might be empty, we use $url to see if the match succeeds.
($uid, $url) = $module_actual_url =~ m{^svn\+ssh://([a-z]+\@)?(svn\.kde\.org)};
($uid, $url) = $module_actual_url =~ m{^svn\+ssh://(?:([a-z]+)\@)?(svn\.kde\.org)};
if ($url && (!$uid || $uid ne 'svn')) {
error ("SVN login scheme has changed for y[b[$module] as of 2013-06-21");

Loading…
Cancel
Save