X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=6c8b406cf3816d9cec4e254233f5063fc8b54205;hp=bb417060e51b3e9c0f01cef1da5adcb47a4ed012;hb=e6d754fa58e9ba2f6d990c4975f474615592a9c9;hpb=cc002579bf0b49bd5a5f2a00dd7100c94a3f81e9

diff --git a/darcs-all b/darcs-all
index bb41706..6c8b406 100644
--- a/darcs-all
+++ b/darcs-all
@@ -17,7 +17,7 @@ if ($defaultrepo =~ /^...*:/) {
     $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;
@@ -56,12 +56,10 @@ sub darcsall {
     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 : "";
 
@@ -75,7 +73,7 @@ sub darcsall {
                 message "== $localpath repo not present; skipping";
             }
         }
-        elsif (! /^$/) {
+        elsif (! /^(#.*)?$/) {
             die "Bad line: $_";
         }
     }
@@ -100,7 +98,7 @@ sub darcsget {
     open IN, "< packages" or die "Can't open packages file";
     while (<IN>) {
         chomp;
-        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
             $tag = defined($2) ? $2 : "";
             $remotepath = $3;
@@ -121,7 +119,7 @@ sub darcsget {
                 }
             }
         }
-        elsif (! /^$/) {
+        elsif (! /^(#.*)?$/) {
             die "Bad line: $_";
         }
     }
@@ -143,11 +141,10 @@ sub main {
         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.