summaryrefslogtreecommitdiff
path: root/darcs-all
diff options
context:
space:
mode:
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>2007-08-29 01:00:11 +0000
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>2007-08-29 01:00:11 +0000
commit218419af65674e52a2070dd84e2195cb4fe203fd (patch)
treed567fe85faa0e3e5ceba0f1567fab9ff52469349 /darcs-all
parent6d60ffad4fd9796c6821efb64037ae91d6e62a0d (diff)
downloadhaskell-218419af65674e52a2070dd84e2195cb4fe203fd.tar.gz
FIX: Remove accidential change to darcs-all in type families patch
- The type families patch includes a change to darcs-all that breaks it for ssh repos at least for Perl 5.8.8 (on MacOS). - My Perl-fu is not sufficient to try to fix the modification, which was supposed to improve darcs-all on windows, so I just revert to the old code.
Diffstat (limited to 'darcs-all')
-rw-r--r--darcs-all5
1 files changed, 2 insertions, 3 deletions
diff --git a/darcs-all b/darcs-all
index f1934dcdb2..7743e8a857 100644
--- a/darcs-all
+++ b/darcs-all
@@ -11,14 +11,13 @@ chomp $defaultrepo;
my $defaultrepo_base;
my $defaultrepo_lib;
-if ($defaultrepo =~ /:\/\//) {
+if ($defaultrepo =~ /:/) {
# HTTP or SSH
$defaultrepo_base = $defaultrepo;
$defaultrepo_base =~ s#/[^/]+/?$##;
$defaultrepo_lib = "$defaultrepo_base/packages";
}
-elsif (($defaultrepo =~ /^\//) or # unix
- ($defaultrepo =~ /^.:/)) { # windows, e.g. c:
+elsif ($defaultrepo =~ /^\//) {
# Local filesystem, absolute path (assumes a checked-out tree):
$defaultrepo_base = $defaultrepo;
$defaultrepo_lib = "$defaultrepo/libraries";