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

Accepting request 106436 from home:a_jaeger:branches:build-compare-test

Browse Source 
Remove release from pre/post scripts

OBS-URL: https://build.opensuse.org/request/show/106436
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=125
This commit is contained in:
Andreas Jaeger 2012-02-22 11:24:20 +00:00 committed by Git OBS Bridge
parent 2d10a86db3
commit ab4f8379cd
3 changed files with 18 additions and 3 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 @@
-------------------------------------------------------------------
Wed Feb 22 11:12:13 UTC 2012 - aj@suse.de
- Remove release from pre/post scripts.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 22 11:07:53 UTC 2012 - coolo@suse.com Wed Feb 22 11:07:53 UTC 2012 - coolo@suse.com

1
build-compare.spec
View File

@ -16,6 +16,7 @@
# #
Name: build-compare Name: build-compare
Summary: Build Result Compare Script Summary: Build Result Compare Script
License: GPL-2.0+ License: GPL-2.0+

15
functions.sh
View File

@ -1,6 +1,6 @@
#! /bin/bash #! /bin/bash
# #
# Copyright (c) 2009, 2010, 2011 SUSE Linux Product GmbH, Germany. # Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany.
# Licensed under GPL v2, see COPYING file for details. # Licensed under GPL v2, see COPYING file for details.
# #
# Written by Michael Matz and Stephan Coolo # Written by Michael Matz and Stephan Coolo
@ -62,8 +62,7 @@ function cmp_spec ()
QF="$QF %{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n" QF="$QF %{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n"
QF="$QF %{PAYLOADFORMAT} %{PAYLOADCOMPRESSOR} %{PAYLOADFLAGS}\\n" QF="$QF %{PAYLOADFORMAT} %{PAYLOADCOMPRESSOR} %{PAYLOADFLAGS}\\n"
QF="$QF [%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG} %{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n"
# XXX We also need to check the existence (but not the content (!)) # XXX We also need to check the existence (but not the content (!))
# of SIGGPG (and perhaps the other SIG*) # of SIGGPG (and perhaps the other SIG*)
@ -99,6 +98,16 @@ function cmp_spec ()
check_provides $oldrpm $release1 > $file1 check_provides $oldrpm $release1 > $file1
check_provides $newrpm $release2 > $file2 check_provides $newrpm $release2 > $file2
if ! diff -au $file1 $file2; then
rm $file1 $file2
return 1
fi
# scripts, might contain release number
QF="[%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG} %{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n"
check_header $oldrpm | sed -e "s,-$release1$,-@RELEASE@," > $file1
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
return 1 return 1