From 37c375c456369a7a691af392680c2e9b23088ccb312ece86027a2de144aabd80 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 20 Oct 2017 06:57:22 +0000 Subject: [PATCH] - 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/package/show/openSUSE:Tools/build-compare?expand=0&rev=240 --- build-compare.changes | 9 +++++++++ build-compare.spec | 2 +- same-build-result.sh | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 7d73c49..68db778 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -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 diff --git a/build-compare.spec b/build-compare.spec index 0c266d3..6fc7431 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -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: 20170727T140623.5b2169e +Version: 20171020T085619.7cef93b Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/same-build-result.sh b/same-build-result.sh index e9f599c..c78fbfe 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -140,11 +140,13 @@ 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 + # Remove odd warning about not-hardlinked files # Remove odd warning about data and time, it comes and goes # Remove warning about python mtime mismatch, a republish will not help # Remove odd warning about filenames, they contain VERSION-RELEASE # Remove durations from progress reports sed -i -e " + /: W: files-duplicate /d /: W: file-contains-date-and-time /d /: W: python-bytecode-inconsistent-mtime /d /: W: filename-too-long-for-joliet /d