[devscripts] 02/03: debcheckout: Recognize more Alioth URLs when using -a

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 286669f9910809465e5284e71f0060b2b5946893
Author: James McCoy <jamessan at debian.org>
Date:   Tue Jun 10 21:15:22 2014 -0400

    debcheckout: Recognize more Alioth URLs when using -a
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog       |  2 ++
 scripts/debcheckout.pl | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7325cb..120086d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ devscripts (2.14.5) UNRELEASED; urgency=medium
       (Closes: #750855)
   * uscan: Use HEAD instead of GET to check for possible GPG signature URLs.
     (Closes: #750929)
+  * debcheckout: Handle more variations of Alioth URLs when attempting to
+    perform an authenticated checkout.  (Closes: #750542)
 
  -- James McCoy <jamessan at debian.org>  Sat, 07 Jun 2014 15:31:54 -0400
 
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 79baa6e..e39fb06 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -450,12 +450,12 @@ sub set_auth($$$$) {
 
     # Adjust urls from new-style anonymous access to old-style and then deal
     # with adjusting for authentication
-    $url =~ s at anonscm\.debian\.org/bzr at bzr.debian.org@;
-    $url =~ s at anonscm\.debian\.org/darcs at darcs.debian.org/darcs@;
+    $url =~ s@(?:alioth\.debian\.org/(?:anonscm/bzr|scm/loggerhead/bzr)|anonscm\.debian\.org/bzr(?:/bzr)?)@bzr.debian.org/bzr@;
+    $url =~ s@(?:alioth\.debian\.org/anonscm/darcs|anonscm\.debian\.org/darcs)@darcs.debian.org/darcs@;
     $url =~ s at git://anonscm\.debian\.org at git://git.debian.org@;
-    $url =~ s at anonscm\.debian\.org/git at git.debian.org/git@;
-    $url =~ s at anonscm\.debian\.org/hg at hg.debian.org/hg@;
-    $url =~ s at svn://anonscm\.debian\.org at svn://svn.debian.org@;
+    $url =~ s@(?:alioth\.debian\.org/anonscm/git|anonscm\.debian\.org/git)@git.debian.org/git@;
+    $url =~ s@(?:alioth\.debian\.org/anonscm/hg|anonscm\.debian\.org/hg)@hg.debian.org/hg@;
+    $url =~ s at svn://(?:scm\.alioth|anonscm)\.debian\.org at svn://svn.debian.org@;
     given ($repo_type) {
 	when ("bzr") {
 	    $url =~ s|^[\w+]+://(bzr\.debian\.org)/(.*)|bzr+ssh://$user$1/bzr/$2|;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git