diff options
| author | Allan McRae <allan@archlinux.org> | 2014-11-18 00:09:11 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-11-18 11:58:25 +1000 |
| commit | a7298c36fdc58ae4d9007a69adea988fbb9cd0db (patch) | |
| tree | 062baf4eeb4eda0c9c24efaac4faf538e98d6176 | |
| parent | d9aa7025ea8c9441bfd50b339a7accc7b61637ab (diff) | |
| download | pacman-a7298c36fdc58ae4d9007a69adea988fbb9cd0db.tar.xz | |
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>
| -rw-r--r-- | scripts/makepkg.sh.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e9da4bb..771aa722 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -391,6 +391,12 @@ extract_file() { rm -f "$srcdir/${file}" 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 local file_type=$(file -bizL "$file") local ext=${file##*.} @@ -1556,11 +1562,6 @@ extract_sources() { get_all_sources_for_arch 'all_sources' for netfile in "${all_sources[@]}"; do 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") case "$proto" in bzr*) |