From 26135823bba3366fb2ab43da7746193923b09ee087e630c74d0e338713643f06 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Dec 2016 08:45:39 +0000 Subject: [PATCH 1/2] - Remove warning about python mtime mismatch, a republish will not help OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=229 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- same-build-result.sh | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 7507cd1..e67e6ce 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 14 08:44:11 UTC 2016 - olaf@aepfle.de + +- Remove warning about python mtime mismatch, a republish will not help + ------------------------------------------------------------------- Wed Nov 9 06:48:22 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 6248830..e86c7aa 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: 20161109T075305.eed6e97 +Version: 20161214T094424.afc1c75 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/same-build-result.sh b/same-build-result.sh index 6636dac..c46fc2e 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -140,9 +140,11 @@ 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 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: 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| " $file1 $file2 From d5daa2fe2072489207467ed4f089acbb69c4834eb05a0ee55a199632c5ae19f6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Dec 2016 09:06:25 +0000 Subject: [PATCH 2/2] - Handle yet another variant of numbered anchor in html file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=230 --- build-compare.changes | 1 + build-compare.spec | 2 +- pkg-diff.sh | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index e67e6ce..dc29fd6 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -2,6 +2,7 @@ Wed Dec 14 08:44:11 UTC 2016 - olaf@aepfle.de - Remove warning about python mtime mismatch, a republish will not help +- Handle yet another variant of numbered anchor in html file ------------------------------------------------------------------- Wed Nov 9 06:48:22 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index e86c7aa..1d570b5 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: 20161214T094424.afc1c75 +Version: 20161214T095953.e1115b2 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index 8b63216..edf6900 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -249,6 +249,7 @@ strip_numbered_anchors() # # # 1 TeX + # # #
#
@@ -261,7 +262,8 @@ strip_numbered_anchors() s@\(]\+id=\n\?"\)\(id[a-z0-9]\+\)\("[^>]*>\)@\1a_idN\3@g s@\(]\+name=\n\?"\)\(id[a-z0-9]\+\)\("[^>]*>\)@\1a_nameN\3@g s@\(]\+href="#\)\([^"]\+\)\("[^>]*>\)@\1href_anchor\3@g - s@\(]\+id="\)\([a-z0-9]\+\)\("[^>]*>\)@\1div_idN\3@g + s@\(]\+href="[^#]\+#\)\([^"]\+\)\("[^>]*>\)@\1href_anchor\3@g + s@\(]\+id="\)\([\.a-z0-9]\+\)\("[^>]*>\)@\1div_idN\3@g } N b N