diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-12 19:19:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-12 19:19:28 -0400 |
| commit | 1dd4574909b40ffdb77ae1338b353156d73983af (patch) | |
| tree | 21a2d65e054964e91ba7376fcbca95b33f7f4472 /Assistant | |
| parent | b8558b724b302a9db16e9b75ac2cba425ecdc5c1 (diff) | |
rename module
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/DaemonStatus.hs | 2 | ||||
| -rw-r--r-- | Assistant/Install.hs | 2 | ||||
| -rw-r--r-- | Assistant/Ssh.hs | 4 | ||||
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index f94521117..af072d8ae 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -9,7 +9,7 @@ module Assistant.DaemonStatus where import Assistant.Common import Assistant.Alert.Utility -import Utility.TempFile +import Utility.Tmp import Assistant.Types.NetMessager import Utility.NotificationBroadcaster import Logs.Transfer diff --git a/Assistant/Install.hs b/Assistant/Install.hs index 227d1bc03..3c7d09698 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -16,7 +16,7 @@ import Assistant.Ssh import Config.Files import Utility.FileMode import Utility.Shell -import Utility.TempFile +import Utility.Tmp import Utility.Env #ifdef darwin_HOST_OS diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 0c718d019..7875c4c4c 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -8,7 +8,7 @@ module Assistant.Ssh where import Common.Annex -import Utility.TempFile +import Utility.Tmp import Utility.UserInfo import Utility.Shell import Git.Remote @@ -146,7 +146,7 @@ authorizedKeysLine rsynconly dir pubkey {- Generates a ssh key pair. -} genSshKeyPair :: IO SshKeyPair -genSshKeyPair = withTempDir "git-annex-keygen" $ \dir -> do +genSshKeyPair = withTmpDir "git-annex-keygen" $ \dir -> do ok <- boolSystem "ssh-keygen" [ Param "-P", Param "" -- no password , Param "-f", File $ dir </> "key" diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 19300cf3c..3c1e6178a 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -33,7 +33,7 @@ import Assistant.WebApp.Control import Assistant.WebApp.OtherRepos import Assistant.Types.ThreadedMonad import Utility.WebApp -import Utility.TempFile +import Utility.Tmp import Utility.FileMode import Git @@ -74,7 +74,7 @@ webAppThread assistantdata urlrenderer noannex listenhost postfirstrun onstartup , return app ) runWebApp listenhost app' $ \addr -> if noannex - then withTempFile "webapp.html" $ \tmpfile _ -> + then withTmpFile "webapp.html" $ \tmpfile _ -> go addr webapp tmpfile Nothing else do let st = threadState assistantdata |