[devscripts] 01/06: debcheckout: Add missing /darcs for authenticated checkout

[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 7f16b6e74aac1daf96595437209b77ef2fe0dfa3
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jun 27 21:11:57 2015 -0400

    debcheckout: Add missing /darcs for authenticated checkout
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog       | 7 +++++--
 scripts/debcheckout.pl | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c63bd59..bbb6c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ devscripts (2.15.6) UNRELEASED; urgency=medium
   * Adjust wording of common suffixes passed to repacksuffix
 
   [ James McCoy ]
-  * debcheckout: Handle Launchpad Git URLs.  Thanks to Colin Watson for the
-    patch.  (Closes: #788777)
+  * debcheckout:
+    + Handle Launchpad Git URLs.  Thanks to Colin Watson for the patch.
+      (Closes: #788777)
+    + Handle authenticated checkout when Vcs-Darcs is missing the root /darcs
+      directory.
   * checkbashisms: Fix unescaped, literal curly brace in regex, causing FTBFS
     with Perl 5.22.  Thanks to Roderich Schupp for the patch.  (Closes:
     #788707)
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 1595d62..4a28f36 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -467,7 +467,7 @@ sub set_auth($$$$) {
 		    if $user_local ne $user_url and !$dont_act;
 		$url =~ s|^\w+://(darcs\.debian\.org)/(~)(.*?)/(.*)|$user$1:~/public_darcs/$4|;
 	    } else {
-		$url =~ s|^\w+://(darcs\.debian\.org)/(.*)|$user$1:/$2|;
+		$url =~ s|^\w+://(darcs\.debian\.org)/(?:darcs/)?(.*)|$user$1:/darcs/$2|;
 	    }
 	}
 	when ("git") {

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