From fd3e3dbbfbac67182638ac21d29f8903e77a67ea7bf6c11db5b20de7ce54282e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 5 May 2020 07:00:09 +0000 Subject: [PATCH 1/2] - handle oddly named ZIP archives OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=268 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- pkg-diff.sh | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 79001a0..04eed85 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 5 05:05:05 UTC 2020 - olaf@aepfle.de + +- handle oddly named ZIP archives + ------------------------------------------------------------------- Tue Mar 31 09:09:09 UTC 2020 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 7127249..df29df6 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: 20200331T115051.28bf642 +Version: 20200505T085902.593c795 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index 789e888..ea6de42 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -1047,6 +1047,11 @@ check_single_file() return 1 fi ;; + Zip\ archive\ data,*) + if ! compare_archive "${file}" 'archive_zip' ; then + return 1 + fi + ;; POSIX\ tar\ archive) mv old/$file{,.tar} mv new/$file{,.tar} From b9318be55fe4cac05fc778464fe745581fd7cd4c2b7251db4a05dc72016dd487 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 8 May 2020 19:02:24 +0000 Subject: [PATCH 2/2] - touch watchdog every 15 instead of 57 minutes OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=269 --- build-compare.changes | 1 + build-compare.spec | 2 +- pkg-diff.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 04eed85..0bb0330 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -2,6 +2,7 @@ Tue May 5 05:05:05 UTC 2020 - olaf@aepfle.de - handle oddly named ZIP archives +- touch watchdog every 15 instead of 57 minutes ------------------------------------------------------------------- Tue Mar 31 09:09:09 UTC 2020 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index df29df6..ddf7a41 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: 20200505T085902.593c795 +Version: 20200508T210136.9aadd6e Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index ea6de42..fc3363c 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -6,7 +6,7 @@ # Written by Michael Matz and Stephan Coolo # Enhanced by Andreas Jaeger declare -i watchdog_host_timeout_seconds='3600' -declare -i watchdog_touch_percent_prior_timeout='96' +declare -i watchdog_touch_percent_prior_timeout='25' declare -i watchdog_next_touch_seconds=0 function watchdog_reset