From: Erich Eckner git@eckner.net

makechrootpkg's download_sources() leaves a stray directory if "makepkg --verifysource" failed. We use "setup_workdir" instead of "mktemp -d", because this ensures the correct garbage collection.

Signed-off-by: Erich Eckner git@eckner.net --- makechrootpkg.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/makechrootpkg.in b/makechrootpkg.in index d81be84..4b72a36 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -250,18 +250,14 @@ download_sources() { local copydir=$1 local makepkg_user=$2

- local builddir - builddir="$(mktemp -d)" - chown "$makepkg_user:" "$builddir" + setup_workdir + chown "$makepkg_user:" "$WORKDIR"

# Ensure sources are downloaded sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \ - env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ + env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \ makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o || die "Could not download sources." - - # Clean up garbage from verifysource - rm -rf "$builddir" }

# Usage: move_products $copydir $owner