From 29b4045817b6b499b1350fcc43d1942acc308297 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 27 Feb 2020 16:36:47 -0500 Subject: [PATCH] Omit TRANS.TBL files from osimport Avoid clutter of TRANS.TBL files while importing an ISO --- librarian/osimport | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/librarian/osimport b/librarian/osimport index feda7e65..3c3162c3 100644 --- a/librarian/osimport +++ b/librarian/osimport @@ -35,6 +35,8 @@ def extract_entries(entries, flags=0, callback=None, totalsize=None): sizedone = 0 with libarchive.extract.new_archive_write_disk(flags) as write_p: for entry in entries: + if str(entry).endswith('TRANS.TBL'): + continue write_header(write_p, entry._entry_p) read_p = entry._archive_p while 1: @@ -133,6 +135,8 @@ def scan_iso(filename): filecontents = {} with libarchive.file_reader(filename) as reader: for ent in reader: + if str(ent).endswith('TRANS.TBL'): + continue filesizes[str(ent)] = ent.size if str(ent) in READFILES: filecontents[str(ent)] = b'' @@ -199,4 +203,4 @@ def import_image(filename): if __name__ == '__main__': - sys.exit(import_image(sys.argv[1])) \ No newline at end of file + sys.exit(import_image(sys.argv[1]))