summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-09-21 14:32:25 +0200
committerErich Eckner <git@eckner.net>2017-09-21 14:32:25 +0200
commit00048bad069528e2ba3e830d6eb27687255b60bc (patch)
tree94c32b092b91019b0c66bca07489870918a35de3
parentf31ef40a8cbba9631ee26039d271b98b266a87ff (diff)
downloadarchlinuxewe.git.save-00048bad069528e2ba3e830d6eb27687255b60bc.tar.xz
tar-inspect: only add for enabled check if the check.log changed
-rwxr-xr-xtar-inspect17
1 files changed, 16 insertions, 1 deletions
diff --git a/tar-inspect b/tar-inspect
index 9f8aabc9..0366577b 100755
--- a/tar-inspect
+++ b/tar-inspect
@@ -226,10 +226,25 @@ for fix_type in 'dependencies' 'variables' 'author_release' 'spellchecker' 'xvfb
}
' 'PKGBUILD'
rm -rf --one-file-system 'src' 'pkg'
- makepkg -fcrs --asdeps --noconfirm
+ makepkg -Lfrs --asdeps --noconfirm || exit $?
+ diff=$(
+ {
+ echo "${fixable_tests}"
+ sed -n "
+ /skipped:/!d
+ $(printf '/skipped:\s*%s/d\n' "${ignores[@]}")
+ $(printf '/skipped:\s*%s/{s/skipped:.*$//;s/\s\+\.\+\s*$//;p}\n' "${tokens[@]}")
+ " ${TAR_FILENAME%%/*}-*-check.log
+ } | \
+ sort | \
+ uniq -u
+ )
+ [ -n "${diff}" ] || exit 1
+ echo "'${diff}'" >&2
git add 'PKGBUILD'
) || \
git checkout -- "${TAR_FILENAME%%/*}/PKGBUILD"
+ rm -f "${TAR_FILENAME%%/*}/${TAR_FILENAME%%/*}-"*'.log'
fi
;;
'variables')