I have a commit to fix this here: https://salsa.debian.org/ddstreet-guest/dpkg/commit/dcccd6ed83989d7a2a752d05b1e4c0326c8c8a21
however it seems that dpkg in salsa has merge requests disabled, so i can't open a merge request for it. Can you review that commit please?