Accepting request 723342 from openSUSE:Tools

- pkg-diff.sh: Ignore R build timestamp & temp paths
  https://github.com/openSUSE/build-compare/pull/34

OBS-URL: https://build.opensuse.org/request/show/723342
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=110
This commit is contained in:
Dominique Leuenberger 2019-08-27 09:58:37 +00:00 committed by Git OBS Bridge
commit 232ad39f3b
3 changed files with 22 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 14 13:27:38 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
- 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 Tue Feb 19 09:30:20 UTC 2019 - olaf@aepfle.de

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: 20190219T103140.3277313 Version: 20190814T133923.4dfa207
Release: 0 Release: 0
Source1: COPYING Source1: COPYING
Source2: same-build-result.sh Source2: same-build-result.sh

View File

@ -752,6 +752,21 @@ check_single_file()
echo "Ignore $file" echo "Ignore $file"
return 0 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) */Linux*Env.Set.sh)
# LibreOffice files, contains: # LibreOffice files, contains:
# Generated on: Mon Apr 18 13:19:22 UTC 2011 # Generated on: Mon Apr 18 13:19:22 UTC 2011