The following commit has been merged in the master branch:
commit 7fc2750a64fffb7ba6c163911fdfe2ef87efce87
Author: Christoph Berg <[email protected]>
Date: Thu Mar 24 14:19:57 2011 +0100
debcheckout: Correctly extract package name from svn://.../trunk/$pkg style
URLs.
diff --git a/debian/changelog b/debian/changelog
index 0637fab..f4bcad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ devscripts (2.10.72) UNRELEASED; urgency=low
* cowpoke: add a --return option that copies the build results back to a
directory somewhere. (Closes: #614268)
+ [ Christoph Berg ]
+ * debcheckout: Correctly extract package name from svn://.../trunk/$pkg
+ style URLs.
+
-- James Vega <[email protected]> Wed, 02 Mar 2011 00:07:34 -0500
devscripts (2.10.71) unstable; urgency=low
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 3648706..6811578 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -979,7 +979,9 @@ sub main() {
$repo_type = guess_repo_type($repo_url, $repo_type);
$pkg = ""; $version = "";
# guess package from url
- if ($repo_url =~ m!([a-z0-9.+-]+)/trunk/?!) { # svn
+ if ($repo_url =~ m!/trunk/([a-z0-9.+-]+)!) { # svn with
{trunk,tags,branches}/$pkg
+ $pkg = $1;
+ } elsif ($repo_url =~ m!([a-z0-9.+-]+)/trunk/?!) { # svn with
$pkg/{trunk,tags,branches}
$pkg = $1;
} elsif ($repo_url =~ /([a-z0-9.+-]+)\.git$/) { # git
$pkg = $1;
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
