Fix distro-info-data helper for aramo release.

helpers/DATA/distro-info-data/add_trisquel_tools_py.patch

@@ -0,0 +1,39 @@
+--- lib/tools.py	2021-10-15 08:01:00.000000000 -0500
++++ lib/tools.py	2022-04-06 12:27:07.672427372 -0500
+@@ -37,7 +37,7 @@
+ def main(validation_function):
+     """Main function with command line parameter parsing."""
+     script_name = os.path.basename(sys.argv[0])
+-    usage = "%s [-h] -d|-u csv-file" % (script_name)
++    usage = "%s [-h] -d|-u|-t csv-file" % (script_name)
+     parser = argparse.ArgumentParser(usage=usage)
+ 
+     parser.add_argument(
+@@ -56,15 +56,24 @@
+         default=False,
+         help="validate an Ubuntu CSV file",
+     )
++    parser.add_argument(
++        "-t",
++        "--trisquel",
++        dest="trisquel",
++        action="store_true",
++        default=False,
++        help="validate a Trisquel CSV file")
+     parser.add_argument("csv_file", metavar="csv-file", help="CSV file to validate")
+ 
+     args = parser.parse_args()
+-    if len([x for x in [args.debian, args.ubuntu] if x]) != 1:
+-        parser.error("You have to select exactly one of --debian, --ubuntu.")
++    if len([x for x in [args.trisquel, args.debian, args.ubuntu] if x]) != 1:
++        parser.error("You have to select exactly one of --trisquel, --debian, --ubuntu.")
+ 
+     if args.debian:
+         distro = "debian"
+-    else:
++    elif args.ubuntu:
+         distro = "ubuntu"
++    else:
++        distro = "trisquel"
+ 
+     return int(not validation_function(args.csv_file, distro))

helpers/DATA/distro-info-data/add_trisquel_validate.patch

@@ -1,51 +1,24 @@
---- validate-csv-data	2020-01-27 15:25:09.000000000 -0600
+--- validate-csv-data	2021-10-15 08:01:00.000000000 -0500
-+++ validate-csv-data_nabia	2021-11-25 01:56:57.107530515 -0600
++++ validate-csv-data	2022-04-06 12:27:29.004706669 -0500
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,13 @@
- import sys
+ 
  
  _COLUMNS = {
-+    "trisquel": ("version", "codename", "series", "created", "release", "eol"),
++    "trisquel": (
-     "debian": ("version", "codename", "series", "created", "release", "eol"),
++        "version",
-     "ubuntu": ("version", "codename", "series", "created", "release", "eol",
++        "codename",
-                "eol-server", "eol-esm"),
++        "series",
-@@ -37,6 +38,7 @@
++        "created",
-     ("eol", "eol-server"),
++        "release",
++        "eol"),
+     "debian": (
+         "version",
+         "codename",
+@@ -58,6 +65,7 @@
+     ("eol-lts", "eol-elts"),
  )
  _STRINGS = {
 +    "trisquel": ("version", "codename", "series"),
      "debian": ("codename", "series"),
      "ubuntu": ("version", "codename", "series"),
  }
-@@ -130,24 +132,28 @@
- def main():
-     """Main function with command line parameter parsing."""
-     script_name = os.path.basename(sys.argv[0])
--    usage = "%s [-h] -d|-u csv-file" % (script_name)
-+    usage = "%s [-h] -d|-u|-t csv-file" % (script_name)
-     parser = argparse.ArgumentParser(usage=usage)
- 
-     parser.add_argument("-d", "--debian", dest="debian", action="store_true",
-                         default=False, help="validate a Debian CSV file")
-     parser.add_argument("-u", "--ubuntu", dest="ubuntu", action="store_true",
-                         default=False, help="validate an Ubuntu CSV file")
-+    parser.add_argument("-t", "--trisquel", dest="trisquel", action="store_true",
-+                        default=False, help="validate a Trisquel CSV file")
-     parser.add_argument("csv_file", metavar="csv-file",
-                         help="CSV file to validate")
- 
-     args = parser.parse_args()
--    if len([x for x in [args.debian, args.ubuntu] if x]) != 1:
--        parser.error("You have to select exactly one of --debian, --ubuntu.")
-+    if len([x for x in [args.trisquel, args.debian, args.ubuntu] if x]) != 1:
-+        parser.error("You have to select exactly one of --trisquel, --debian, --ubuntu.")
- 
-     if args.debian:
-         distro = "debian"
--    else:
-+    elif args.ubuntu:
-         distro = "ubuntu"
-+    else:
-+        distro = "trisquel"
- 
-     return int(not validate(args.csv_file, distro))
-