summaryrefslogtreecommitdiff
path: root/Remote/Bup.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Remote/Bup.hs')
-rw-r--r--Remote/Bup.hs21
1 files changed, 3 insertions, 18 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 29c7a0419..958831019 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -8,30 +8,15 @@
module Remote.Bup (remote) where
import qualified Data.ByteString.Lazy.Char8 as L
-import System.IO
import System.IO.Error
-import Control.Exception.Extensible (IOException)
import qualified Data.Map as M
-import Control.Monad (when)
-import Control.Monad.State (liftIO)
import System.Process
-import System.Exit
-import System.FilePath
-import Data.Maybe
-import Data.List.Utils
-import System.Cmd.Utils
-import Types
+import AnnexCommon
import Types.Remote
import qualified Git
-import qualified Annex
import UUID
-import Locations
import Config
-import Utility
-import Utility.Conditional
-import Utility.SafeCommand
-import Messages
import Utility.Ssh
import Remote.Helper.Special
import Remote.Helper.Encryptable
@@ -118,14 +103,14 @@ bupSplitParams r buprepo k src = do
store :: Git.Repo -> BupRepo -> Key -> Annex Bool
store r buprepo k = do
- g <- Annex.gitRepo
+ g <- gitRepo
let src = gitAnnexLocation g k
params <- bupSplitParams r buprepo k (File src)
liftIO $ boolSystem "bup" params
storeEncrypted :: Git.Repo -> BupRepo -> (Cipher, Key) -> Key -> Annex Bool
storeEncrypted r buprepo (cipher, enck) k = do
- g <- Annex.gitRepo
+ g <- gitRepo
let src = gitAnnexLocation g k
params <- bupSplitParams r buprepo enck (Param "-")
liftIO $ catchBool $