pool/build-compare
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- pkg-diff: fix diff returning 0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=253
This commit is contained in:
Olaf Hering 2018-07-06 14:02:40 +00:00 committed by Git OBS Bridge
parent 5d84d5ea8c
commit e3e3d3e14d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-compare.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 6 14:01:17 UTC 2018 - olaf@aepfle.de
- pkg-diff: fix diff returning 0
-------------------------------------------------------------------
Wed Jul 4 05:58:13 UTC 2018 - olaf@aepfle.de

2
build-compare.spec
View File

@ -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: 20180704T075846.8f3031d
Version: 20180706T160151.66224a8
Release: 0
Source1: COPYING
Source2: same-build-result.sh

5
pkg-diff.sh
View File

@ -469,6 +469,7 @@ check_compressed_file()
check_single_file()
{
local file="$1"
local ret=0
# If the two files are the same, return at once.
if [ -f old/$file -a -f new/$file ]; then
@ -512,7 +513,6 @@ check_single_file()
cd $pwd/new/$fdir
cpio --quiet --extract --force-local < "../${file##*/}"
cd $pwd
local ret=0
for f in $flist; do
if ! check_single_file $fdir/$f; then
ret=1
@ -529,7 +529,6 @@ check_single_file()
fdir=$file.extract.$PPID.$$
unsquashfs -no-progress -dest old/$fdir "old/$file"
unsquashfs -no-progress -dest new/$fdir "new/$file"
local ret=0
for f in $flist; do
if ! check_single_file $fdir/$f; then
ret=1
@ -550,7 +549,6 @@ check_single_file()
cd $pwd/new/$fdir
tar xf `basename $file`
cd $pwd
local ret=0
for f in $flist; do
if ! check_single_file $fdir/$f; then
ret=1
@ -582,7 +580,6 @@ check_single_file()
cd $pwd/new/$fdir
unjar `basename $file`
cd $pwd
local ret=0
for f in $flist; do
if test -f new/$fdir/$f && ! check_single_file $fdir/$f; then
ret=1