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

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

Browse Source 
Copy from home:a_jaeger:branches:build-compare-test/build-compare via accept of submit request 40612 revision 30.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/40612
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=71
This commit is contained in:
Andreas Jaeger 2010-05-25 07:35:03 +00:00 committed by Git OBS Bridge
parent 94fc6ede57
commit fa1e1998e5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-compare.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun May 23 12:19:56 UTC 2010 - aj@suse.de
- Release is at end of line, avoid wrong matches.
-------------------------------------------------------------------
Fri May 21 21:46:47 UTC 2010 - cmorve69@yahoo.es
- Improved ELF executable detection (bnc#604049).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 20 08:23:52 UTC 2010 - aj@suse.de Thu May 20 08:23:52 UTC 2010 - aj@suse.de

4
rpm-check.sh
View File

@ -159,7 +159,7 @@ check_provides()
QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n"
QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n"
QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n"
check_header "$1" | sed -e "s,-$2,-@RELEASE@," check_header "$1" | sed -e "s,-$2$,-@RELEASE@,"
} }
check_provides $oldrpm $release1 > $file1 check_provides $oldrpm $release1 > $file1
@ -462,7 +462,7 @@ check_single_file()
return 1 return 1
fi fi
;; ;;
*executable*|*LSB\ shared\ object*) *ELF*executable*|*ELF*LSB\ shared\ object*)
objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1
if ! test -s $file1; then if ! test -s $file1; then
# objdump has no idea how to handle it # objdump has no idea how to handle it