From 59c7476a621faa44636f1fe89e442ce3a4b0bca85afcb02e783ad9c93f58fff1 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Mar 2016 16:49:47 +0000 Subject: [PATCH] - Handle /var/adm/update-messages in scripts and filelist OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=204 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- functions.sh | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index da094be..89fe6f4 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 8 16:48:48 UTC 2016 - olaf@aepfle.de + +- Handle /var/adm/update-messages in scripts and filelist + ------------------------------------------------------------------- Mon Mar 7 11:56:28 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 11bcac7..56959b7 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: 20160308T134726.8485d3c +Version: 20160308T174907.9a42867 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/functions.sh b/functions.sh index 437bb7c..02be91e 100644 --- a/functions.sh +++ b/functions.sh @@ -26,6 +26,7 @@ function trim_release_old() sed -e " /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g} s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g + s/\(\/var\/adm\/update-messages\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g " } function trim_release_new() @@ -33,6 +34,7 @@ function trim_release_new() sed -e " /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g} s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g + s/\(\/var\/adm\/update-messages\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g " } # Get single directory or filename with long or short release string