Remove redundant fromIntegral calls

[ghc-hetmet.git] / darcs-all

diff --git a/darcs-all b/darcs-all
index d53ed36..6c8b406 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -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: $_";
         }
     }