$defaultrepo_base =~ s#/[^/]+/?$##;
$checked_out_tree = 0;
}
-elsif ($defaultrepo =~ /^(\.\.)?\//) {
+elsif ($defaultrepo =~ /^\/|\.\.\/|.:(\/|\\)/) {
# Local filesystem, either absolute or relative path
# (assumes a checked-out tree):
$defaultrepo_base = $defaultrepo;
my $path;
my $tag;
- darcs @_;
-
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
- if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+ if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
$localpath = $1;
$tag = defined($2) ? $2 : "";
message "== $localpath repo not present; skipping";
}
}
- elsif (! /^$/) {
+ elsif (! /^(#.*)?$/) {
die "Bad line: $_";
}
}
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
- if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+ if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
$localpath = $1;
$tag = defined($2) ? $2 : "";
$remotepath = $3;
}
}
}
- elsif (! /^$/) {
+ elsif (! /^(#.*)?$/) {
die "Bad line: $_";
}
}
elsif ($arg eq "-s") {
$verbose = 0;
}
- # --ci says we grab cabal-install repo, and the libraries it needs
- # with 'get'.
+ # --dph says we grab the dph libs with 'get'.
# It has no effect on the other commands.
- elsif ($arg eq "--ci") {
- $tags{"ci"} = 1;
+ elsif ($arg eq "--dph") {
+ $tags{"dph"} = 1;
}
# --extra says we grab the extra libs with 'get'.
# It has no effect on the other commands.