Author: adam-guest
Date: 2008-03-25 21:40:17 +0000 (Tue, 25 Mar 2008)
New Revision: 1204
Modified:
trunk/debian/changelog
trunk/scripts/debcheckout.pl
Log:
debcheckout:
+ Tighten the "repository owner" regex for darcs.d.o to correctly check
http://darcs.d.o/~foo/bar/baz against user foo
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-25 20:06:09 UTC (rev 1203)
+++ trunk/debian/changelog 2008-03-25 21:40:17 UTC (rev 1204)
@@ -5,6 +5,9 @@
deciding whether it's a comment line and skipping it
+ Fix heredoc detection to match '<< \EOT ... EOT' but not
'<< "\EOT" ... EOT'
+ * debcheckout:
+ + Tighten the "repository owner" regex for darcs.d.o to correctly check
+ http://darcs.d.o/~foo/bar/baz against user foo
-- Adam D. Barratt <[EMAIL PROTECTED]> Tue, 25 Mar 2008 18:51:59 +0000
Modified: trunk/scripts/debcheckout.pl
===================================================================
--- trunk/scripts/debcheckout.pl 2008-03-25 20:06:09 UTC (rev 1203)
+++ trunk/scripts/debcheckout.pl 2008-03-25 21:40:17 UTC (rev 1204)
@@ -236,10 +236,10 @@
my $user_local = $user;
$user_local =~ s|(.*)(@)|$1|;
my $user_url = $url;
- $user_url =~ s|^\w+://(darcs\.debian\.org)/(~)(.*)/.*|$3|;
+ $user_url =~ s|^\w+://(darcs\.debian\.org)/(~)(.*?)/.*|$3|;
die "the local user '$user_local' doesn't own the personal
repository '$url'\n"
if $user_local ne $user_url;
- $url =~
s|^\w+://(darcs\.debian\.org)/(~)(.*)/(.*)|$user$1:~/public_darcs/$4|;
+ $url =~
s|^\w+://(darcs\.debian\.org)/(~)(.*?)/(.*)|$user$1:~/public_darcs/$4|;
} else {
$url =~ s|^\w+://(darcs\.debian\.org)/(.*)|$user$1:/darcs/$2|;
}
--
To unsubscribe, send mail to [EMAIL PROTECTED]
