From 989da4c3e3d3bc926fa1788d7b84648c35a052c270db853810af3534dcda6b69 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 22 Sep 2010 13:34:16 +0000 Subject: [PATCH 1/3] Accepting request 48800 from home:coolo:branches:openSUSE:Factory Thanks, looks fine. OBS-URL: https://build.opensuse.org/request/show/48800 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=83 --- build-compare.changes | 5 +++++ rpm-check.sh | 23 +++++------------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index ee347af..393d880 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 22 13:24:19 UTC 2010 - coolo@novell.com + +- ignore texlive's fmt files as discussed with werner + ------------------------------------------------------------------- Mon Sep 20 19:24:10 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index 52bb489..c83ae04 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -279,8 +279,7 @@ check_single_file() # deprecated-list is randomly ordered, sort it for comparison case $f in */deprecated-list.html) - sort $f > ${f}.sort - mv ${f}.sort $f + sort -o $f $f ;; esac done @@ -294,8 +293,7 @@ check_single_file() */fonts.scale|*/fonts.dir|*/encodings.dir) for f in old/$file new/$file; do # sort files before comparing - sort $f > $f.tmp - mv $f.tmp $f + sort -o $f $f done ;; /var/adm/perl-modules/*) @@ -335,20 +333,9 @@ check_single_file() done ;; /var/lib/texmf/web2c/*/*fmt) - # same of these are gzip compressed - for f in old/$file new/$file; do - fftype=`/usr/bin/file $f | cut -d: -f2-` - case $fftype in - *gzip\ compressed\ data*) - gunzip -cd $f > $f.tmp - mv $f.tmp $f - ;; - *) - ;; - esac - # date is of variable length, e.g. 2009.7.21 - sed -i -e 's|(format=[a-z]*tex 20..\.[0-9]*\.[0-9]*)|(format=luatex 2009.1.1)|' $f - done + # binary dump of latex formats, we can ignore them for good + echo "difference in $file ignored." + return 0 ;; */libtool) for f in old/$file new/$file; do From ff9822aed6b9dd24e0c2deeec9b82deab516c930c5b891d23acb4e085c8ae268 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 23 Sep 2010 22:01:41 +0000 Subject: [PATCH 2/3] Accepting request 48806 from openSUSE:Tools checked in (request 48806) OBS-URL: https://build.opensuse.org/request/show/48806 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=84 --- build-compare.changes | 5 ----- rpm-check.sh | 23 ++++++++++++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 393d880..ee347af 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 22 13:24:19 UTC 2010 - coolo@novell.com - -- ignore texlive's fmt files as discussed with werner - ------------------------------------------------------------------- Mon Sep 20 19:24:10 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index c83ae04..52bb489 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -279,7 +279,8 @@ check_single_file() # deprecated-list is randomly ordered, sort it for comparison case $f in */deprecated-list.html) - sort -o $f $f + sort $f > ${f}.sort + mv ${f}.sort $f ;; esac done @@ -293,7 +294,8 @@ check_single_file() */fonts.scale|*/fonts.dir|*/encodings.dir) for f in old/$file new/$file; do # sort files before comparing - sort -o $f $f + sort $f > $f.tmp + mv $f.tmp $f done ;; /var/adm/perl-modules/*) @@ -333,9 +335,20 @@ check_single_file() done ;; /var/lib/texmf/web2c/*/*fmt) - # binary dump of latex formats, we can ignore them for good - echo "difference in $file ignored." - return 0 + # same of these are gzip compressed + for f in old/$file new/$file; do + fftype=`/usr/bin/file $f | cut -d: -f2-` + case $fftype in + *gzip\ compressed\ data*) + gunzip -cd $f > $f.tmp + mv $f.tmp $f + ;; + *) + ;; + esac + # date is of variable length, e.g. 2009.7.21 + sed -i -e 's|(format=[a-z]*tex 20..\.[0-9]*\.[0-9]*)|(format=luatex 2009.1.1)|' $f + done ;; */libtool) for f in old/$file new/$file; do From 4f1209fdbfcd54332644bd22db646968b05b75f49879807f5455b2450fb04255 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 23 Sep 2010 22:01:42 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/build-compare revision 39.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=47348e0c3e0e231971a39dacd3a0d182 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- rpm-check.sh | 23 +++++------------------ 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index ee347af..393d880 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 22 13:24:19 UTC 2010 - coolo@novell.com + +- ignore texlive's fmt files as discussed with werner + ------------------------------------------------------------------- Mon Sep 20 19:24:10 UTC 2010 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index fb102a3..26f018c 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script Version: 2009.10.14 -Release: 22 +Release: 23 Source1: COPYING Source2: same-build-result.sh Source3: rpm-check.sh diff --git a/rpm-check.sh b/rpm-check.sh index 52bb489..c83ae04 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -279,8 +279,7 @@ check_single_file() # deprecated-list is randomly ordered, sort it for comparison case $f in */deprecated-list.html) - sort $f > ${f}.sort - mv ${f}.sort $f + sort -o $f $f ;; esac done @@ -294,8 +293,7 @@ check_single_file() */fonts.scale|*/fonts.dir|*/encodings.dir) for f in old/$file new/$file; do # sort files before comparing - sort $f > $f.tmp - mv $f.tmp $f + sort -o $f $f done ;; /var/adm/perl-modules/*) @@ -335,20 +333,9 @@ check_single_file() done ;; /var/lib/texmf/web2c/*/*fmt) - # same of these are gzip compressed - for f in old/$file new/$file; do - fftype=`/usr/bin/file $f | cut -d: -f2-` - case $fftype in - *gzip\ compressed\ data*) - gunzip -cd $f > $f.tmp - mv $f.tmp $f - ;; - *) - ;; - esac - # date is of variable length, e.g. 2009.7.21 - sed -i -e 's|(format=[a-z]*tex 20..\.[0-9]*\.[0-9]*)|(format=luatex 2009.1.1)|' $f - done + # binary dump of latex formats, we can ignore them for good + echo "difference in $file ignored." + return 0 ;; */libtool) for f in old/$file new/$file; do