From 58b5de78020f65ec54ba3ddb20741d9bf9906ad6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 22 Nov 2014 20:42:20 -0400 Subject: [PATCH] Revert "avoid removing whole localdir every time the precompiled tarball is uploaded" This reverts commit 40bec41f569a73a8e95d9acf91f0ae7465b0f8c0. --- src/Propellor/Spin.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 1688bca..cffa761 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -217,7 +217,7 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor where go tmpdir = do cacheparams <- sshCachingParams hn - let shimdir = takeFileName localdir "shim" + let shimdir = takeFileName localdir createDirectoryIfMissing True (tmpdir shimdir) changeWorkingDirectory (tmpdir shimdir) me <- readSymbolicLink "/proc/self/exe" @@ -237,10 +237,9 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor unpackcmd = shellWrap $ intercalate " && " [ "cd " ++ takeDirectory remotetarball - , "rm -rf " ++ localdir "shim" + , "rm -rf " ++ localdir , "tar xzf " ++ remotetarball , "rm -f " ++ remotetarball - , "ln -sf shim/propellor propellor/propellor" ] -- Shim for git push over the propellor ssh channel.