diff options
| author | Junghyun Kim <jh0822.kim@samsung.com> | 2016-08-31 10:34:51 +0900 |
|---|---|---|
| committer | Junghyun Kim <jh0822.kim@samsung.com> | 2016-08-31 11:34:21 +0900 |
| commit | 8f377373ef0011df54ea7f7287cf48fc6bae05e0 (patch) | |
| tree | 194c0c4a74ddb182df249ddf8580e3ba200189e7 | |
| parent | d5e77a41329d45d4ccec8332ae417a5b361aa0c0 (diff) | |
| download | build-compare-8f377373ef0011df54ea7f7287cf48fc6bae05e0.tar.gz build-compare-8f377373ef0011df54ea7f7287cf48fc6bae05e0.tar.bz2 build-compare-8f377373ef0011df54ea7f7287cf48fc6bae05e0.zip | |
Replace date/time string in ASCII/text file.
Change-Id: If057c5df9941815acc992a92d256d2af41311ff2
Signed-off-by: Junghyun Kim <jh0822.kim@samsung.com>
| -rw-r--r-- | packaging/pkg-diff.sh | 18 | ||||
| -rw-r--r-- | packaging/same-build-result.sh | 2 |
2 files changed, 18 insertions, 2 deletions
diff --git a/packaging/pkg-diff.sh b/packaging/pkg-diff.sh index 2fd3ded..71ac0da 100644 --- a/packaging/pkg-diff.sh +++ b/packaging/pkg-diff.sh @@ -81,6 +81,19 @@ function unjar() esac } +# remove date string combined with "generated" and "on" +#usage remove_date_string <file> +function remove_date_string() { + file=$1 + date_str=$(grep -i "Generated" $file | grep "on" | sed -e 's,.* on \([A-Za-z 0-9:\-\/]*\).*,\1,g') + date -d "$date_str" &> /dev/null + if [ $? -ne 0 ]; then + return; + fi + sed -e "s/$date_str//g" $file +} + + # list files in directory #usage unjar_l <file> function unjar_l() @@ -724,7 +737,10 @@ check_single_file() return 1 ;; *ASCII*|*text*) - if ! cmp -s old/$file new/$file; then + echo "file = $file" + remove_date_string old/$file > $file1 + remove_date_string new/$file > $file2 + if ! cmp -s $file1 $file2; then echo "$file differs ($ftype)" diff -u old/$file new/$file | head -n 200 return 1 diff --git a/packaging/same-build-result.sh b/packaging/same-build-result.sh index e46999f..71583fc 100644 --- a/packaging/same-build-result.sh +++ b/packaging/same-build-result.sh @@ -41,7 +41,7 @@ if [[ $dist =~ "prerelease" ]]; then num_old_pkgs=`find $OLDDIR -name '*.rpm' -and ! -name '*.delta.rpm' -and ! -name '*.src.rpm' | wc -l` if test $num_new_pkgs != $num_old_pkgs; then echo "different number of subpackages" - find $OLDDIR $NEWDIRS -name '*.rpm' -and ! -name '*.delta.rpm' + find $OLDDIR $NEWDIRS -name '*.rpm' -and ! -name '*.delta.rpm' -and ! -name '*.src.rpm' exit 1 fi |