diff options
| author | Erich Eckner <git@eckner.net> | 2018-06-27 09:05:43 +0200 |
|---|---|---|
| committer | Levente Polyak <anthraxx@archlinux.org> | 2019-01-22 01:44:40 +0100 |
| commit | 8310abb3485bdf63fc3557e3020a43f9f9e03927 (patch) | |
| tree | df1b2d16e835b80f8ec565898fdc6262ec657fe9 | |
| parent | 7b095250030dd85684226a6191d739d2f04424a3 (diff) | |
| download | devtools32-8310abb3485bdf63fc3557e3020a43f9f9e03927.tar.xz | |
remove empty tree if "--verifysource" failed
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>
| -rw-r--r-- | makechrootpkg.in | 10 |
1 files 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 |