Make the "tag" column of the packages file always present

It makes the parsing simpler if we always have the same number of columns

1 files changed, 14 insertions, 12 deletions

diff --git a/boot b/boot
index 339f21dca2..6683ad5698 100644
--- a/boot
+++ b/boot
@@ -8,6 +8,7 @@ use Cwd;
 system("/usr/bin/perl", "-w", "boot-pkgs") == 0
     or die "Running boot-pkgs failed: $?";
 
+my $tag;
 my $dir;
 my $curdir;
 
@@ -20,21 +21,22 @@ while (<PACKAGES>) {
     if (/^#/) {
         # Comment; do nothing
     }
-    elsif (/^([a-zA-Z0-9\/.-]+) *[^ ]+ *[^ ]+$/) {
+    elsif (/^([a-zA-Z0-9\/.-]+) *([^ ]+) *[^ ]+ *[^ ]+$/) {
         $dir = $1;
+        $tag = $2;
         
-        # We would like to just check for an _darcs directory here, but in
-        # an lndir tree we avoid making _darcs directories, so it doesn't
-        # exist. We therefore require that every repo has a LICENSE file
-        # instead.
-        if (! -f "$dir/LICENSE") {
-            print STDERR "Error: $dir/LICENSE doesn't exist.\n";
-            die "Maybe you haven't done './darcs-all get'?";
-        }
-    }
-    elsif (/^([a-zA-Z0-9\/.-]+) *[^ ]+ *[^ ]+ *[^ ]+$/) {
-        # These are lines which refer to optional repositories, so their
+        # If $tag is not "-" then it is an optional repository, so its
         # absence isn't an error.
+        if ($tag eq "-") {
+            # We would like to just check for an _darcs directory here,
+            # but in an lndir tree we avoid making _darcs directories,
+            # so it doesn't exist. We therefore require that every repo
+            # has a LICENSE file instead.
+            if (! -f "$dir/LICENSE") {
+                print STDERR "Error: $dir/LICENSE doesn't exist.\n";
+                die "Maybe you haven't done './darcs-all get'?";
+            }
+        }
     }
     else {
         die "Bad line in packages file: $_";