Remove support for manifest versions 1.3/1.4.

Partial revert of f70fbb87f674d603fc42b472c8c35d375da2d403.

The support for manifest versions 1.3 and 1.4 was intended to
support validation of https://review.linaro.org/#/c/13601/ which
is now abandoned. Some cleanups from that commit have been retained.

1 files changed, 5 insertions, 18 deletions

diff --git a/validate-manifest.pl b/validate-manifest.pl
index c3ecd04..d86d692 100755
--- a/validate-manifest.pl
+++ b/validate-manifest.pl
@@ -81,16 +81,6 @@ while ($line = <>)
         $component_info{$1}{$2} = $3;
         next;
     }
-    if ($state == 2 && $line=~/^# ([a-z]+)_(branch|tag)=(.*)/)
-    {
-        # version 1.3 makes branch and tag lines comments. These are optional,
-        # so we simply ignore them. For older manifests report an error.
-        if (!version_ge("1.3"))
-        {
-            error("Unexpected branch or tag comment", $line);
-        }
-        next;
-    }
     if ($state == 1 && $line=~/^ #*$/)
     {
         # OK
@@ -187,13 +177,10 @@ sub fields_for_component
     {
         # we could accept md5sums in 1.0/1.1 manifests, but I think it's
         # better to reject them for 1.0/1.1 and require them for 1.2.
-        # version 1.3 temporarily removes md5sum to ease review/merging.
-        $fields{md5sum} = 1 if version_ge("1.2") && $mani_ver ne "1.3";
+        $fields{md5sum} = 1 if version_ge("1.2");
     } else {
         $fields{revision} = 1;
-        # in 1.3, the *_branch field became a comment, so we must only accept
-        # the field in earlier versions.
-        $fields{branch} = 1 if !version_ge("1.3");
+        $fields{branch} = 1;
     }
     return %fields;
 }
@@ -346,10 +333,10 @@ sub check_components_list
 
 sub check_manifest_version
 {
-   if ($mani_ver !~ /^1\.[1234]$/)
+   if ($mani_ver !~ /^1\.[12]$/)
    {
-       error("Unknown manifest version $mani_ver, treating as 1.4");
-       $mani_ver = "1.4";
+       error("Unknown manifest version $mani_ver, treating as 1.2");
+       $mani_ver = "1.2";
    }
 }