From 65e0daeec131d87efcfd216ac27a877d73eb7a0f0714f5053263527b211373fc Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 27 Jul 2020 06:44:19 +0000
Subject: [PATCH] - Fix regression in compare_archive

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=279
---
 build-compare.changes | 5 +++++
 build-compare.spec    | 2 +-
 pkg-diff.sh           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build-compare.changes b/build-compare.changes
index 4659593..01e7709 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 27 06:06:06 UTC 2020 - bwiedemann@suse.de
+
+- Fix regression in compare_archive
+
 -------------------------------------------------------------------
 Fri May 29 19:20:21 UTC 2020 - olaf@aepfle.de
 
diff --git a/build-compare.spec b/build-compare.spec
index 7e57d87..e67b1a5 100644
--- a/build-compare.spec
+++ b/build-compare.spec
@@ -21,7 +21,7 @@ Summary:        Build Result Compare Script
 License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            https://github.com/openSUSE/build-compare
-Version:        20200529T212652.102d844
+Version:        20200727T083615.6fb967d
 Release:        0
 Source1:        COPYING
 Source2:        same-build-result.sh
diff --git a/pkg-diff.sh b/pkg-diff.sh
index 16285f2..0cf0d34 100644
--- a/pkg-diff.sh
+++ b/pkg-diff.sh
@@ -789,6 +789,7 @@ compare_archive()
         : "${REPLY}"
         filelist+=( "${REPLY}" )
       done < 'cn'
+      ret=0
       for f in "${filelist[@]}"
       do
         if ! check_single_file "${file}/${f}"
@@ -801,7 +802,6 @@ compare_archive()
         fi
         watchdog_touch
       done
-      ret=$?
     else
       wprint "$file has different file list"
       diff -u 'co' 'cn'