X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=darcs-all;h=6c8b406cf3816d9cec4e254233f5063fc8b54205;hb=b9d13108742ba43244490e0a90b6c80127561139;hp=0462930a0785a4a4d78f71520888144d551989d0;hpb=0055054b55e26c70f316073e319722cd3737dcdc;p=ghc-hetmet.git diff --git a/darcs-all b/darcs-all index 0462930..6c8b406 100644 --- 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 () { chomp; - if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) { + if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) { $localpath = $1; $tag = defined($2) ? $2 : ""; @@ -100,7 +98,7 @@ sub darcsget { open IN, "< packages" or die "Can't open packages file"; while () { chomp; - if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) { + if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) { $localpath = $1; $tag = defined($2) ? $2 : ""; $remotepath = $3; @@ -121,7 +119,7 @@ sub darcsget { } } } - elsif (! /^$/) { + elsif (! /^(#.*)?$/) { die "Bad line: $_"; } }