From 072c4e5ab9a4cc3daf9b1714378ad75d61788ff3 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 24 Jun 2022 09:40:12 +0200
Subject: [PATCH] Listing /firmware/dep11/README.txt in md5sum.txt if all its
 MD5 lines are equal

---
 test/merge_debian_isos     |  10 +++++++++-
 test/merge_debian_isos.sig | Bin 72 -> 72 bytes
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/merge_debian_isos b/test/merge_debian_isos
index 4ba33e63..00cbedd6 100755
--- a/test/merge_debian_isos
+++ b/test/merge_debian_isos
@@ -532,7 +532,7 @@ check_and_put_out_md5_grep() {
   fi
   if echo "$prev_path" | grep '^\.\/firmware\/' >/dev/null 2>&1
   then
-    if test "$was_multiple" = 1
+    if test "$was_multiple" = 1 && test "$multi_md5_differs" = 1
     then
       # There is the risk that the surviving file does not match prev_md5.
       # Better omit it.
@@ -573,12 +573,19 @@ polish_md5sum_txt() {
   prev_path=
   prev_md5=
   was_multiple=0
+  multi_md5_differs=0
 
   cat merged_md5sum.txt | \
   while read md5 path
   do
     if test "$path" = "$prev_path"
     then
+      if test "$md5" = "$prev_md5"
+      then
+        dummy=dummy
+      else
+        multi_md5_differs=1
+      fi
       was_multiple=1
   continue
     fi
@@ -590,6 +597,7 @@ polish_md5sum_txt() {
     prev_path="$path"
     prev_md5="$md5"
     was_multiple=0
+    multi_md5_differs=0
   done
 
   if test -n "$prev_path"
diff --git a/test/merge_debian_isos.sig b/test/merge_debian_isos.sig
index 733cc4446763519e0a1cc4ed48dcdd8618eaa9f0..460c49059a7267d922c39aa685cb40e49021413b 100644
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0%Ek@AOH#p5b4X`z^lNhRQVGCpG8Grb{l3ynG^Hdb4vrt
e&@)}O>;Rr2`@}B5nam~@F-}chKa)Q1+|sDU4IW1T

literal 72
zcmV-O0Jr~$Mg#y60ssaD0%Ek8tpExM5b4X`z^lNhRA4CppsbWbdn6vb9H0fEg4tCe
eOOGiUe*m9cwgof3wquMTu^?UntBQ>neD=kc;v3EY