diff --git a/build-compare.changes b/build-compare.changes index a23e076..4f00ec7 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jul 15 09:50:58 UTC 2015 - olaf@aepfle.de + +- 2015.07.15 +- Handle more texi2html generated files and patterns + +------------------------------------------------------------------- +Wed Jun 17 14:25:06 UTC 2015 - olaf@aepfle.de + +- 2015.06.17 +- Fix regex to handle /lib/(modules|firmware)/version-release-any properly + ------------------------------------------------------------------- Tue Apr 28 11:52:12 UTC 2015 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index edb8c15..f964790 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: 2015.04.28 +Version: 2015.07.15 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/functions.sh b/functions.sh index aa01e28..437bb7c 100644 --- a/functions.sh +++ b/functions.sh @@ -38,11 +38,11 @@ function trim_release_new() # Get single directory or filename with long or short release string function grep_release_old() { - grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))" + grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))" } function grep_release_new() { - grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))" + grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))" } function check_provides() diff --git a/pkg-diff.sh b/pkg-diff.sh index 261f0c8..e59474a 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -475,15 +475,18 @@ check_single_file() done ;; /usr/share/doc/packages/*/*.html|\ - /usr/share/doc/kde/HTML/*/*/*.html|/usr/share/doc/*/html/*.html) + /usr/share/doc/packages/*/*/*.html|\ + /usr/share/doc/*/html/*.html|\ + /usr/share/doc/kde/HTML/*/*/*.html) for f in old/$file new/$file; do - # texi2html output, e.g. in kvm, indent, qemu - sed -i -e "s|^|| + s|^