Olaf Hering 2015-10-22 06:42:20 +00:00 committed by Git OBS Bridge
parent 990e418064
commit 1ec92090ef
5 changed files with 36 additions and 8 deletions

12
_service Normal file
View File

@ -0,0 +1,12 @@
<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="scm">git</param>
</service>
<service name="extract_file" mode="disabled">
<param name="archive">*.tar</param>
<param name="files">*/build-compare.* */*.sh */COPYING</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Oct 22 06:29:44 UTC 2015 - olaf@aepfle.de
- Remove filename-too-long-for-joliet from rpmlint.log
-------------------------------------------------------------------
Mon Oct 12 13:59:31 UTC 2015 - olaf@aepfle.de
- Filter out durations from rpmlint progress report
-------------------------------------------------------------------
Fri Oct 2 09:00:52 UTC 2015 - olaf@aepfle.de
- Handle texi2html 5.0 timestamps
-------------------------------------------------------------------
Fri Aug 21 12:57:57 UTC 2015 - seife+obs@b1-systems.com

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: 20150821T175907.9b8c0be
Version: 20151022T083541.cd832db
Release: 0
Source1: COPYING
Source2: same-build-result.sh

View File

@ -481,9 +481,11 @@ check_single_file()
for f in old/$file new/$file; do
sed -i -e '
s|<!-- Created on [^,]\+, [0-9]\+ [0-9]\+ by texi2html [0-9\.]\+ -->|<!-- Created on July, 14 2015 by texi2html 1.78 -->|
s|<!-- Created on [^,]\+, [0-9]\+ by texi2html [0-9\.]\+$|<!-- Created on October 1, 2015 by texi2html 5.0|
s|^<!-- Created on .*, 20.. by texi2html .\...|<!-- Created on August 7, 2009 by texi2html 1.82|
s|This document was generated by <em>Autobuild</em> on <em>[^,]\+, [0-9]\+ [0-9]\+</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html [0-9\.]\+</em></a>.|This document was generated by <em>Autobuild</em> on <em>July, 15 2015</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.78</em></a>.|
s|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|
s|^ *This document was generated on <i>[a-zA-Z]\+ [0-9]\+, [0-9]\+</i> using <a href="http://www.nongnu.org/texi2html/"><i>texi2html [0-9\.]\+</i></a>.| This document was generated on <i>October 1, 2015</i> using <a href="http://www.nongnu.org/texi2html/"><i>texi2html 5.0</i></a>.|
s|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |
s|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |
' $f

View File

@ -117,13 +117,12 @@ if test -n "$OTHERDIR"; then
# Remove release from files
sort -u $OLDDIR/rpmlint.log|sed -e "s,$ver_rel1,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file1
sort -u $OTHERDIR/rpmlint.log|sed -e "s,$ver_rel2,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file2
### kmp's are strange:
# the correct way would be to find the versions of -kmp- packages and ignore them, but this will do, too.
# example: this one leads to constant republishing of virtualbox for every build.
# -virtualbox-guest-kmp-default.x86_64: W: filename-too-long-for-joliet virtualbox-guest-kmp-default-5.0.2_k3.16.7_24-177.d_l_ocaml.2.x86_64.rpm
# +virtualbox-guest-kmp-default.x86_64: W: filename-too-long-for-joliet virtualbox-guest-kmp-default-5.0.2_k3.16.7_24-178.d_l_ocaml.1.x86_64.rpm
sed -i -e "/W: filename-too-long-for-joliet/s,\(^.*-kmp-.*-kmp-\).*$,\1," $file1
sed -i -e "/W: filename-too-long-for-joliet/s,\(^.*-kmp-.*-kmp-\).*$,\1," $file2
# Remove odd warning about filenames, they contain VERSION-RELEASE
# Remove durations from progress reports
sed -i -e "
/: W: filename-too-long-for-joliet /d
/: I: \(filelist-initialization\|check-completed\) /s| [0-9]\+\.[0-9] s| x.x s|
" $file1 $file2
if ! cmp -s $file1 $file2; then
echo "rpmlint.log files differ:"
diff -u $file1 $file2 |head -n 20