1 files changed, 2 insertions, 2 deletions
diff --git a/darcs-all b/darcs-all
index 0272df55f1..6c8b406cf3 100644
--- a/darcs-all
+++ b/darcs-all
@@ -98,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;
@@ -119,7 +119,7 @@ sub darcsget {
                 }
             }
         }
-        elsif (! /^$/) {
+        elsif (! /^(#.*)?$/) {
             die "Bad line: $_";
         }
     }