From 82681ecb4f443d8ec333848c9c0388acd43c186a Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 31 Jul 2017 20:37:42 +0200 Subject: remove empty tree if "--verifysource" failed --- makechrootpkg.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index f67489e..032ffc5 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -248,18 +248,14 @@ download_sources() { local copydir=$1 local makepkg_user=$2 - local builddir - builddir="$(mktemp -d)" - chown "$makepkg_user:$makepkg_user" "$builddir" + setup_workdir + chown "$makepkg_user:$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 -- cgit v1.2.3-70-g09d2