Author: adam-guest
Date: 2008-02-15 13:37:38 +0000 (Fri, 15 Feb 2008)
New Revision: 1016
Modified:
trunk/debian/changelog
trunk/scripts/debcheckout.pl
Log:
debcheckout:
+ Handle spaces between -d and the root for cvs repositories
(Closes: #465849)
+ Fix a warning about uninitialised values when a module name is not
supplied for a cvs repository
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-14 20:11:19 UTC (rev 1015)
+++ trunk/debian/changelog 2008-02-15 13:37:38 UTC (rev 1016)
@@ -4,6 +4,11 @@
* Debbugs.pm: Add status()
* tagpending: Rewrite in perl using Debbugs.pm
* README, debian/control: Update description of tagpending
+ * debcheckout:
+ + Handle spaces between -d and the root for cvs repositories
+ (Closes: #465849)
+ + Fix a warning about uninitialised values when a module name is not
+ supplied for a cvs repository
-- Adam D. Barratt <[EMAIL PROTECTED]> Tue, 12 Feb 2008 08:50:01 +0000
Modified: trunk/scripts/debcheckout.pl
===================================================================
--- trunk/scripts/debcheckout.pl 2008-02-14 20:11:19 UTC (rev 1015)
+++ trunk/scripts/debcheckout.pl 2008-02-15 13:37:38 UTC (rev 1016)
@@ -135,7 +135,7 @@
# a given target directory.
sub set_destdir(@$$) {
my ($repo_type, $destdir, @cmd) = @_;
- $destdir =~ s|^-d||;
+ $destdir =~ s|^-d\s*||;
switch ($repo_type) {
case "cvs" { my $module = pop @cmd; push @cmd, ("-d", $destdir, $module); }
@@ -187,8 +187,9 @@
switch ($repo_type) {
case "arch" { @cmd = ("tla", "grab", $repo_url); } # XXX ???
case "bzr" { @cmd = ("bzr", "branch", $repo_url); }
- case "cvs" { $repo_url =~ s|^-d||;
+ case "cvs" { $repo_url =~ s|^-d\s*||;
my ($root, $module) = split /\s+/, $repo_url;
+ $module ||= '';
@cmd = ("cvs", "-d", $root, "checkout", $module); }
case "darcs" { @cmd = ("darcs", "get", $repo_url); }
case "git" { @cmd = ("git", "clone", $repo_url); }
--
To unsubscribe, send mail to [EMAIL PROTECTED]
