diff options
| author | Allan McRae <allan@archlinux.org> | 2016-02-12 21:09:47 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-02-20 14:01:53 +1000 |
| commit | 7624101e181c6c7262a40fc34797d591d062d4d4 (patch) | |
| tree | a409d0d4acc1dbe9dcc234e084ae5069bbcb9647 | |
| parent | a1a8d067e0264ade802229d418acfb019528f97c (diff) | |
| download | pacman-7624101e181c6c7262a40fc34797d591d062d4d4.tar.xz | |
Revert "makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD"
This reverts commit f9423cfa5d5b9f2041b70676438082faad1cd1ee.
This created issue when building packages with debug info multiple times.
It could be fixed, but it confirmed my initial opinion that keeping other
directories in $pkgdirbase was wrong. Use different BUILDDIRs if you want
to build different things from a single PKGBUILD.
| -rw-r--r-- | scripts/makepkg.sh.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 16c21b72..1c3758b5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2223,13 +2223,10 @@ if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else - # clean existing pkg directories + # clean existing pkg directory if [[ -d $pkgdirbase ]]; then msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" - for pkg in "${pkgname[@]}"; do - rm -rf "$pkgdirbase/$pkg" - done - unset pkg + rm -rf "$pkgdirbase" fi mkdir -p "$pkgdirbase" chmod a-srw "$pkgdirbase" |