Commit 03cfe9e2 authored by Eli Schwartz's avatar Eli Schwartz Committed by Andrew Gregory
Browse files

libmakepkg/strip: don't re-add the same debug source multiple times



It's either a waste of work, or triggers edge cases in some packages
(like coreutils-8.31) where the source file is readonly and cp gets a
permission denied error trying to overwrite it with an identical copy of
itself.

Also while we are at it, make the variable names be something readable,
because I could barely tell what this was doing while editing it.

Signed-off-by: Eli Schwartz's avatarEli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae's avatarAllan McRae <allan@archlinux.org>
(cherry picked from commit 3674144a)
parent b3be0ce9
......@@ -56,11 +56,14 @@ strip_file() {
fi
# copy source files to debug directory
local f t
local file dest t
while IFS= read -r t; do
f=${t/${dbgsrcdir}/"$srcdir"}
mkdir -p "${dbgsrc/"$dbgsrcdir"/}${t%/*}"
cp -- "$f" "${dbgsrc/"$dbgsrcdir"/}$t"
file=${t/${dbgsrcdir}/"$srcdir"}
dest="${dbgsrc/"$dbgsrcdir"/}$t"
if ! [[ -f $dest ]]; then
mkdir -p "${dest%/*}"
cp -- "$file" "$dest"
fi
done < <(source_files "$binary")
# copy debug symbols to debug directory
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment