From c2fe719794e2c0311d8dc41dc5e7ae22af2e455e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 18 Feb 2015 15:04:11 +0100 Subject: [PATCH] MT#9683 Undo to the TMPDIR changes piuparts provides the TMPDIR unfiltered to all subprocesses, so plenty of tools fail with it. :( --- wrapper/piuparts_runner | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/wrapper/piuparts_runner b/wrapper/piuparts_runner index ed297c7..0f48752 100755 --- a/wrapper/piuparts_runner +++ b/wrapper/piuparts_runner @@ -10,10 +10,6 @@ rm -f piuparts.tap [ -n "$SCRIPTSDIR" ] || SCRIPTSDIR="$PWD/source/scripts/" -# /var/cache/pbuilder/ exists on all our slaves and if there's enough -# memory available then it's available as tmpfs -[ -n "$TMPDIR" ] || TMPDIR="$(sudo mktemp -d --tmpdir=/var/cache/pbuilder/ --suffix=_piuparts_tmp)" - # MT#5671 iff we get release-2.8-update, release-2.8 or release-2.8-builddeps # then we want to use only the '2.8' part for our release variable case "$release" in @@ -69,7 +65,7 @@ create_base_tgz() { ) } -piuparts_cmdline="sudo release=$release TMPDIR=$TMPDIR SCRIPTSDIR=$PWD/source/scripts/ distribution=$distribution piuparts_wrapper --mirror=$mirror -i etc/init.d/ngcp-hylafaxplus -i etc/default/ngcp-iaxmodem" +piuparts_cmdline="sudo release=$release SCRIPTSDIR=$PWD/source/scripts/ distribution=$distribution piuparts_wrapper --mirror=$mirror -i etc/init.d/ngcp-hylafaxplus -i etc/default/ngcp-iaxmodem" ce_pro_carrier() { echo "*** Running for CE packages ***" @@ -154,5 +150,3 @@ else fi piuparts_tap --ignore-broken-symlinks piuparts.txt > piuparts.tap - -sudo rmdir "$TMPDIR"