projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the catching of "IOEnv failure" with extensible extensions
[ghc-hetmet.git]
/
darcs-all
diff --git
a/darcs-all
b/darcs-all
index
bb41706
..
0462930
100644
(file)
--- a/
darcs-all
+++ b/
darcs-all
@@
-17,7
+17,7
@@
if ($defaultrepo =~ /^...*:/) {
$defaultrepo_base =~ s#/[^/]+/?$##;
$checked_out_tree = 0;
}
$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;
# Local filesystem, either absolute or relative path
# (assumes a checked-out tree):
$defaultrepo_base = $defaultrepo;
@@
-75,7
+75,7
@@
sub darcsall {
message "== $localpath repo not present; skipping";
}
}
message "== $localpath repo not present; skipping";
}
}
- elsif (! /^$/) {
+ elsif (! /^(#.*)?$/) {
die "Bad line: $_";
}
}
die "Bad line: $_";
}
}
@@
-143,11
+143,10
@@
sub main {
elsif ($arg eq "-s") {
$verbose = 0;
}
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.
# 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.
}
# --extra says we grab the extra libs with 'get'.
# It has no effect on the other commands.