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

Accepting request 535371 from openSUSE:Tools

Browse Source 
- Remove newly introduced files-duplicate check from rpmlint
  In case files are hardlinked, the source and destination is
  scrambled in rpm output: the pkg will be republished.
  In case files are not hardlinked, the source and destination
  is scrambled in rpmlint output: the pkg will be republished

OBS-URL: https://build.opensuse.org/request/show/535371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=105
This commit is contained in:
Dominique Leuenberger 2017-10-28 12:18:06 +00:00 committed by Git OBS Bridge
commit 7bc95c5e73
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build-compare.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Oct 20 06:53:18 UTC 2017 - olaf@aepfle.de
- Remove newly introduced files-duplicate check from rpmlint
In case files are hardlinked, the source and destination is
scrambled in rpm output: the pkg will be republished.
In case files are not hardlinked, the source and destination
is scrambled in rpmlint output: the pkg will be republished
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 27 12:05:25 UTC 2017 - olaf@aepfle.de Thu Jul 27 12:05:25 UTC 2017 - olaf@aepfle.de

2
build-compare.spec
View File

@ -21,7 +21,7 @@ Summary: Build Result Compare Script
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://github.com/openSUSE/build-compare Url: https://github.com/openSUSE/build-compare
Version: 20170727T140623.5b2169e Version: 20171020T085619.7cef93b
Release: 0 Release: 0
Source1: COPYING Source1: COPYING
Source2: same-build-result.sh Source2: same-build-result.sh

2
same-build-result.sh
View File

@ -140,11 +140,13 @@ if test -n "$OTHERDIR"; then
# Remove release from files # 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 $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 sort -u $OTHERDIR/rpmlint.log|sed -e "s,$ver_rel2,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file2
# Remove odd warning about not-hardlinked files
# Remove odd warning about data and time, it comes and goes # Remove odd warning about data and time, it comes and goes
# Remove warning about python mtime mismatch, a republish will not help # Remove warning about python mtime mismatch, a republish will not help
# Remove odd warning about filenames, they contain VERSION-RELEASE # Remove odd warning about filenames, they contain VERSION-RELEASE
# Remove durations from progress reports # Remove durations from progress reports
sed -i -e " sed -i -e "
/: W: files-duplicate /d
/: W: file-contains-date-and-time /d /: W: file-contains-date-and-time /d
/: W: python-bytecode-inconsistent-mtime /d /: W: python-bytecode-inconsistent-mtime /d
/: W: filename-too-long-for-joliet /d /: W: filename-too-long-for-joliet /d