diff --git a/build-compare.changes b/build-compare.changes index 3f2df7f..581c611 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 14 13:27:38 UTC 2019 - John Vandenberg + +- pkg-diff.sh: Ignore R build timestamp & temp paths + https://github.com/openSUSE/build-compare/pull/34 + ------------------------------------------------------------------- Tue Feb 19 09:30:20 UTC 2019 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 551aa5b..1e79332 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: 20190219T103140.3277313 +Version: 20190814T133923.4dfa207 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index fd6ee8b..ca84188 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -752,6 +752,21 @@ check_single_file() echo "Ignore $file" return 0 ;; + /usr/lib*/R/library/*/DESCRIPTION) + # Simulate R CMD INSTALL --built-timestamp='' + # Built: R 3.6.1; x86_64-suse-linux-gnu; 2019-08-13 04:19:49 UTC; unix + sed -i -e 's|\(Built: [^;]*; [^;]*; \)20[0-9][0-9]-[01][0-9]-[0123][0-9] [012][0-9]:[0-5][0-9]:[0-5][0-9] UTC\(; .*\)$|\1\2|' old/$file new/$file + ;; + /usr/lib*/R/library/*/Meta/package.rds) + # R binary cache of DESCRIPTION + echo "Ignore $file" + return 0 + ;; + /usr/lib*/R/library/*/R/*.rd[bx]) + # binary cache of interpreted R code + echo "Ignore $file" + return 0 + ;; */Linux*Env.Set.sh) # LibreOffice files, contains: # Generated on: Mon Apr 18 13:19:22 UTC 2011