pool/build-compare
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 920691 from openSUSE:Tools

Browse Source 
- Fix build-compare for shadow package
- Properly drop another duration from rpmlint.log
- Drop another duration from rpmlint.log

OBS-URL: https://build.opensuse.org/request/show/920691
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=119
This commit is contained in:
Dominique Leuenberger 2021-09-25 20:51:17 +00:00 committed by Git OBS Bridge
commit 452e9a3a01
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="versionformat">%ci.%h</param>
<param name="url">git://github.com/openSUSE/build-compare.git</param>
<param name="url">https://github.com/openSUSE/build-compare.git</param>
<param name="scm">git</param>
</service>
<service name="extract_file" mode="disabled">

15
build-compare.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Sep 21 19:19:19 UTC 2021 - Stephan Kulow <coolo@suse.de>
- Fix build-compare for shadow package
-------------------------------------------------------------------
Mon Sep 20 08:25:27 UTC 2021 - Andreas Schwab <schwab@suse.de>
- Properly drop another duration from rpmlint.log
-------------------------------------------------------------------
Mon Sep 6 07:15:06 UTC 2021 - bwiedemann@suse.de
- Drop another duration from rpmlint.log
-------------------------------------------------------------------
Wed Aug 11 20:30:40 UTC 2021 - olaf@aepfle.de

2
build-compare.spec
View File

@ -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: 20210811T224256.f313711
Version: 20210921T214418.86d06d9
Release: 0
Source1: COPYING
Source2: same-build-result.sh

8
pkg-diff.sh
View File

@ -893,7 +893,9 @@ check_single_file()
monodis "new/$file" 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2}
if ! cmp -s "${file1}" "${file2}"; then
wprint "$file differs ($ftype)"
diff --speed-large-files -u "${file1}" "${file2}"
diff --speed-large-files -u \
--label "old $file (monodis)" "${file1}" \
--label "new $file (monodis)" "${file2}"
return 1
fi
else
@ -904,9 +906,9 @@ check_single_file()
ELF*executable*|\
ELF*[LM]SB\ relocatable*|\
ELF*[LM]SB\ shared\ object*|\
setuid\ ELF*[LM]SB\ shared\ object*|\
set?id\ ELF*[LM]SB\ shared\ object*|\
ELF*[LM]SB\ pie\ executable*|\
setuid\ ELF*[LM]SB\ pie\ executable*)
set?id\ ELF*[LM]SB\ pie\ executable*)
diff --speed-large-files --unified \
--label "old $file (disasm)" \
--label "new $file (disasm)" \

1
same-build-result.sh
View File

@ -151,6 +151,7 @@ if test -n "$OTHERDIR"; then
/: W: python-bytecode-inconsistent-mtime /d
/: W: filename-too-long-for-joliet /d
/: I: \(filelist-initialization\|check-completed\) /s| [0-9]\+\.[0-9] s| x.x s|
s/; has taken [0-9]\+\.[0-9] s/; has taken x.x s/
" $file1 $file2
if ! cmp -s $file1 $file2; then
echo "rpmlint.log files differ:"