Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-09-11 15:04:00 +0200
committerTakashi Iwai <tiwai@suse.de>2018-09-11 15:04:00 +0200
commitbc8c7c0adb2ccd5cea173111d4c22728921f2d66 (patch)
tree9339a002316555fadf5a7169a5bbc8f68d4ebdea
parente8c8c63933dbc2706b51deb0782a58402154ade7 (diff)
parent8ab85ffc817cbbb0e8f4c8a40666f0ccbf2feb5c (diff)
Merge branch 'users/tiwai/scripts/for-next' into SLE12-SP3rpm-4.4.155-94.50
-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