From 5973d7a13b988425bf360cbf9ab67549e5391121 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Fri, 27 Sep 2024 16:43:02 -0400
Subject: [PATCH] show dups in header dump

---
 koji/__init__.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/koji/__init__.py b/koji/__init__.py
index 44ef330c..ac514ab8 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -688,10 +688,10 @@ class RawHeader(object):
         data = [_ord(x) for x in self.header[8:12]]
         il = multibyte(data[:4])
         dl = multibyte(data[4:8])
-        self._store = 16 + il * 16
 
         # read the index (starts at offset 16)
-        index = {}
+        index = []
+        tag_index = {}
         for i in range(il):
             entry = []
             for j in range(4):
@@ -700,9 +700,14 @@ class RawHeader(object):
                 entry.append(multibyte(data))
 
             # print("Tag: %d, Type: %d, Offset: %x, Count: %d" % tuple(entry))
-            index[entry[0]] = entry
+            index.append(entry)
+            tag_index[entry[0]] = entry
+            # in case of duplicate tags, last one wins
+
         self.datalen = dl
-        self.index = index
+        self._store = 16 + il * 16
+        self._index = index  # list
+        self.index = tag_index  # dict
 
     def dump(self, sig=None):
         print("HEADER DUMP:")
@@ -710,7 +715,7 @@ class RawHeader(object):
         print("Store at offset %d (0x%0x)" % (store, store))
         # sort entries by offset, dtype
         # also rearrange: tag, dtype, offset, count -> offset, dtype, tag, count
-        order = sorted([(x[2], x[1], x[0], x[3]) for x in six.itervalues(self.index)])
+        order = sorted([(x[2], x[1], x[0], x[3]) for x in self._index])
         # map some rpmtag codes
         tags = {}
         if rpm: