testing/build-compare
SHA256
3
0
Fork 0
forked from pool/build-compare
Code Pull Requests Activity

- Remove hacks from /var/adm/update-scripts|messages case

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=205
This commit is contained in:
Olaf Hering 2016-03-08 18:42:04 +00:00 committed by Git OBS Bridge
parent 59c7476a62
commit 9f7118010d
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-compare.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 8 18:00:40 UTC 2016 - olaf@aepfle.de
- Remove hacks from /var/adm/update-scripts|messages case
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 8 16:48:48 UTC 2016 - olaf@aepfle.de Tue Mar 8 16:48:48 UTC 2016 - olaf@aepfle.de

2
build-compare.spec
View File

@ -21,7 +21,7 @@ Summary: Build Result Compare Script
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://github.com/openSUSE/build-compare Url: https://github.com/openSUSE/build-compare
Version: 20160308T174907.9a42867 Version: 20160308T194108.4a952dd
Release: 0 Release: 0
Source1: COPYING Source1: COPYING
Source2: same-build-result.sh Source2: same-build-result.sh

4
functions.sh
View File

@ -40,11 +40,11 @@ function trim_release_new()
# Get single directory or filename with long or short release string # Get single directory or filename with long or short release string
function grep_release_old() 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|/var/adm/update-scripts)/[^/]*(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))"
} }
function grep_release_new() 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|/var/adm/update-scripts)/[^/]*(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))"
} }
function check_provides() function check_provides()

14
pkg-diff.sh
View File

@ -655,19 +655,9 @@ check_single_file()
return 0 return 0
;; ;;
/var/adm/update-messages/*|/var/adm/update-scripts/*) /var/adm/update-messages/*|/var/adm/update-scripts/*)
# encode version-release inside
oldfn=`echo "$file"|sed -e s/-$release2/-$release1/;`
# fetchmsttfonts embeds the release number in the update shell script. # fetchmsttfonts embeds the release number in the update shell script.
echo sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" sed -i "s/${name_ver_rel_old_regex_l}/@NAME_VER_REL@/" old/$file
sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" sed -i "s/${name_ver_rel_new_regex_l}/@NAME_VER_REL@/" new/$file
if ! diff -u old/$oldfn new/$file; then
echo "$oldfn is not same as $file"
return 1
fi
echo "$file and $oldfn are same"
return 0
;; ;;
*.ps) *.ps)
for f in "old/$file" "new/$file"; do for f in "old/$file" "new/$file"; do