Home Home > GIT Browse > scripts
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-09-11 14:53:35 +0200
committerMichal Suchanek <msuchanek@suse.de>2018-09-11 14:58:56 +0200
commit18a9758c2e81c5797f5709e5bc573ccc7dc24a9c (patch)
treeacfb1123cec20b9d5234cbc7730f59d11f0e28f1
parent4be920feb00bf087a1d96e5053e5a7fe5c160167 (diff)
scripts/tar-up.sh: Don't package gitlog-excludes file
Also fix the evaluation of gitlog-excludes file, too
-rwxr-xr-xscripts/tar-up.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh
index b933faab7d..54014a8c99 100755
--- a/scripts/tar-up.sh
+++ b/scripts/tar-up.sh
@@ -207,7 +207,7 @@ fi
if grep -q '^Source.*:[[:space:]]*log\.sh[[:space:]]*$' rpm/kernel-source.spec.in; then
cp -p scripts/rpm-log.sh "$build_dir"/log.sh
fi
-rm -f "$build_dir/kernel-source.changes.old" "$build_dir/gitlog-fixups"
+rm -f "$build_dir/kernel-source.changes.old" "$build_dir/gitlog-fixups" "$build_dir/gitlog-excludes"
if test -e "$build_dir"/config-options.changes; then
# Rename to avoid triggering a build service rule error
mv "$build_dir"/config-options.changes \
@@ -243,7 +243,7 @@ elif $using_git; then
echo "expected \"last commit: <commit>\" in rpm/kernel-source.changes.old" >&2
exit 1
esac
- if test -d rpm/gitlog-excludes; then
+ if test -e rpm/gitlog-excludes; then
exclude=(--excludes "$_" "${exclude[@]}")
fi
if test -e rpm/gitlog-fixups; then