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

Accepting request 241368 from home:msmeissn:branches:openSUSE:Tools

Browse Source 
- Allow file list changes where the release number is encoded
  in the filename.
- compare post-update message and scripts (fixes fetchmsttfonts
  constant republish) as they have the release number hardcoded.

OBS-URL: https://build.opensuse.org/request/show/241368
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=145
This commit is contained in:
Andreas Jaeger 2014-07-17 18:31:37 +00:00 committed by Git OBS Bridge
parent 06e44f70d5
commit 5f0dcc8131
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-compare.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 17 06:46:47 UTC 2014 - meissner@suse.com
- Allow file list changes where the release number is encoded
in the filename.
- compare post-update message and scripts (fixes fetchmsttfonts
constant republish) as they have the release number hardcoded.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 15 11:42:09 CEST 2014 - ohering@suse.de Tue Jul 15 11:42:09 CEST 2014 - ohering@suse.de

11
functions.sh
View File

@ -126,8 +126,8 @@ function cmp_spec ()
QF="[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS} %{FILELINKTOS}\n]\\n" QF="[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS} %{FILELINKTOS}\n]\\n"
# ??? what to do with FILEPROVIDE and FILEREQUIRE? # ??? what to do with FILEPROVIDE and FILEREQUIRE?
check_header $oldrpm > $file1 check_header $oldrpm | sed -e "s,-$release1,-@RELEASE@," > $file1
check_header $newrpm > $file2 check_header $newrpm | sed -e "s,-$release2,-@RELEASE@," > $file2
if ! diff -au $file1 $file2; then if ! diff -au $file1 $file2; then
rm $file1 $file2 rm $file1 $file2
@ -136,9 +136,10 @@ function cmp_spec ()
# now the md5sums. if they are different, we check more detailed # now the md5sums. if they are different, we check more detailed
# if there are different filenames, we will already have aborted before # if there are different filenames, we will already have aborted before
QF="[%{FILENAMES} %{FILEMD5S}\n]\\n" # file flag 64 means "ghost", filter those out.
check_header $oldrpm > $file1 QF="[%{FILENAMES} %{FILEMD5S} %{FILEFLAGS}\n]\\n"
check_header $newrpm > $file2 check_header $oldrpm |grep -v " 64$"> $file1
check_header $newrpm |grep -v " 64$"> $file2
RES=2 RES=2
# done if the same # done if the same

15
rpm-check.sh
View File

@ -402,6 +402,21 @@ check_single_file()
echo "Ignore $file" echo "Ignore $file"
return 0 return 0
;; ;;
/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.
echo sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn"
sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn"
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
;;
*pdf) *pdf)
# PDF files contain a unique ID, remove it # PDF files contain a unique ID, remove it
# Format of the ID is: # Format of the ID is: