makepkg: symlink files in noextract into $srcdir
File in noextract should still be symlinked into $srcdir so that they can be accessed without using $SRCDEST. Using noextract on VCS files makes no sense as these are not being extracted, so now this does nothing. Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
d9aa7025ea
commit
a7298c36fd
|
@ -391,6 +391,12 @@ extract_file() {
|
||||||
rm -f "$srcdir/${file}"
|
rm -f "$srcdir/${file}"
|
||||||
ln -s "$filepath" "$srcdir/"
|
ln -s "$filepath" "$srcdir/"
|
||||||
|
|
||||||
|
if in_array "$file" "${noextract[@]}"; then
|
||||||
|
# skip source files in the noextract=() array
|
||||||
|
# these are marked explicitly to NOT be extracted
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
# do not rely on extension for file type
|
# do not rely on extension for file type
|
||||||
local file_type=$(file -bizL "$file")
|
local file_type=$(file -bizL "$file")
|
||||||
local ext=${file##*.}
|
local ext=${file##*.}
|
||||||
|
@ -1556,11 +1562,6 @@ extract_sources() {
|
||||||
get_all_sources_for_arch 'all_sources'
|
get_all_sources_for_arch 'all_sources'
|
||||||
for netfile in "${all_sources[@]}"; do
|
for netfile in "${all_sources[@]}"; do
|
||||||
local file=$(get_filename "$netfile")
|
local file=$(get_filename "$netfile")
|
||||||
if in_array "$file" "${noextract[@]}"; then
|
|
||||||
# skip source files in the noextract=() array
|
|
||||||
# these are marked explicitly to NOT be extracted
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
local proto=$(get_protocol "$netfile")
|
local proto=$(get_protocol "$netfile")
|
||||||
case "$proto" in
|
case "$proto" in
|
||||||
bzr*)
|
bzr*)
|
||||||
|
|
Loading…
Reference in New Issue