propellor spin

src/Propellor/Property/Chroot/Util.hs

@@ -9,7 +9,8 @@ import Control.Applicative
 standardPathEnv :: IO [(String, String)]
 standardPathEnv = do
 	path <- getEnvDefault "PATH" "/bin"
-	addEntry "PATH" (path ++ std)
+	addEntry "PATH" (path ++ stdPATH)
 		<$> getEnvironment
-  where
-	std = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+stdPATH :: String
+stdPATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

src/Propellor/Property/OS.hs

@@ -94,7 +94,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
 			let dest = "/" ++ takeFileName d
 			whenM (not <$> fileExist dest) $
 				rename d dest
-		removeDirectory newOSDir
+		removeDirectoryRecursive newOSDir
 		return MadeChange
 	
 	trickydirs =