The following commit has been merged in the master branch:
commit 4c1665d98a3b5c50efd8da2b445ab40c93041e11
Author: James Vega <[email protected]>
Date: Wed Jun 1 22:44:32 2011 -0400
debcheckout: Handle Alioth's new anonymous access URLs
Closes: #628674
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 0c38101..c3749dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low
[ James Vega ]
* debchange: Remove dapper from the list of recognized distributions.
+ * debcheckout: Handle Alioth's new anonymous access URLs when converting to
+ authenticated URLs. (Closes: #628674)
-- Benjamin Drung <[email protected]> Sun, 29 May 2011 18:41:13 +0200
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 38a9023..99e8646 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -425,6 +425,14 @@ sub set_auth($$$$) {
$user_local =~ s|(.*)(@)|$1|;
my $user_url = $url;
+ # Adjust urls from new-style anonymous access to old-style and then deal
+ # with adjusting for authentication
+ $url =~ s@anonscm\.debian\.org/[email protected]@;
+ $url =~ s@anonscm\.debian\.org/[email protected]/darcs@;
+ $url =~ s@git://anonscm\.debian\.org@git://git.debian.org@;
+ $url =~ s@anonscm\.debian\.org/[email protected]/git@;
+ $url =~ s@anonscm\.debian\.org/[email protected]/hg@;
+ $url =~ s@svn://anonscm\.debian\.org@svn://svn.debian.org@;
given ($repo_type) {
when ("bzr") {
$url =~
s|^[\w+]+://(bzr\.debian\.org)/(.*)|bzr+ssh://$user$1/bzr/$2|;
@@ -921,6 +929,8 @@ sub guess_repo_type($$) {
$repo_type = $1;
} elsif ($repo_url =~ /^https?:\/\/(svn|git|hg|bzr|darcs)\.debian\.org/) {
$repo_type = $1;
+ } elsif ($repo_url =~
m@^https?://anonscm.debian.org/(svn|git|hg|bzr|darcs)/@) {
+ $repo_type = $1;
}
return $repo_type;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
