From a0f5264cbd8e328692cc0033a8f73cccad9d2328 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 3 Sep 2023 22:27:24 +0200
Subject: [PATCH] rlist: remove support for {tam} placeholder

archives are now always TAM-authenticated.
---
 src/borg/archive.py                   | 1 -
 src/borg/helpers/parseformat.py       | 4 ----
 src/borg/testsuite/archiver/checks.py | 8 ++++----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/borg/archive.py b/src/borg/archive.py
index 3ce5e62c2..eb470f960 100644
--- a/src/borg/archive.py
+++ b/src/borg/archive.py
@@ -493,7 +493,6 @@ class Archive:
         self.name = name  # overwritten later with name from archive metadata
         self.name_in_manifest = name  # can differ from .name later (if borg check fixed duplicate archive names)
         self.comment = None
-        self.tam_verified = True
         self.numeric_ids = numeric_ids
         self.noatime = noatime
         self.noctime = noctime
diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py
index 65d7ac7f3..b4a455a04 100644
--- a/src/borg/helpers/parseformat.py
+++ b/src/borg/helpers/parseformat.py
@@ -751,7 +751,6 @@ class ArchiveFormatter(BaseFormatter):
             "username": partial(self.get_meta, "username", ""),
             "comment": partial(self.get_meta, "comment", ""),
             "command_line": partial(self.get_meta, "command_line", ""),
-            "tam": self.get_tam,
             "size": partial(self.get_meta, "size", 0),
             "nfiles": partial(self.get_meta, "nfiles", 0),
             "end": self.get_ts_end,
@@ -797,9 +796,6 @@ class ArchiveFormatter(BaseFormatter):
     def get_ts_end(self):
         return self.format_time(self.archive.ts_end)
 
-    def get_tam(self):
-        return "verified" if self.archive.tam_verified else "none"
-
     def format_time(self, ts):
         return OutputTimestamp(ts)
 
diff --git a/src/borg/testsuite/archiver/checks.py b/src/borg/testsuite/archiver/checks.py
index bb8ca65e9..f6311c8e3 100644
--- a/src/borg/testsuite/archiver/checks.py
+++ b/src/borg/testsuite/archiver/checks.py
@@ -413,8 +413,8 @@ def test_check_rebuild_manifest(archiver):
         repository.delete(Manifest.MANIFEST_ID)  # kill manifest, so check has to rebuild it
         repository.commit(compact=False)
     cmd(archiver, "check", "--repair")
-    output = cmd(archiver, "rlist", "--format='{name} tam:{tam}{NL}'")
-    assert "archive_tam tam:verified" in output  # TAM-verified archive is in rebuilt manifest
+    output = cmd(archiver, "rlist", "--format='{name}{NL}'")
+    assert "archive_tam" in output  # TAM-verified archive is in rebuilt manifest
     assert "archive_no_tam" not in output  # check got rid of untrusted not TAM-verified archive
 
 
@@ -426,8 +426,8 @@ def test_check_rebuild_refcounts(archiver):
     with repository:
         write_archive_without_tam(repository, "archive_no_tam")
     cmd(archiver, "check", "--repair")
-    output = cmd(archiver, "rlist", "--format='{name} tam:{tam}{NL}'")
-    assert "archive_tam tam:verified" in output  # TAM-verified archive still there
+    output = cmd(archiver, "rlist", "--format='{name}{NL}'")
+    assert "archive_tam" in output  # TAM-verified archive still there
     assert "archive_no_tam" not in output  # check got rid of untrusted not TAM-verified archive
     archive_id_post_check = cmd(archiver, "rlist", "--format='{name} {id}{NL}'")
     assert archive_id_post_check == archive_id_pre_check  # rebuild_refcounts didn't change archive_tam archive id