summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-23 16:01:02 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-23 16:01:02 -0400
commit2c2cdf5ba76c1160d75834e1b9cf5f0c279adef6 (patch)
tree023ec185fcd3614c9d6c235164c1f72c203bc5fb /Remote
parent6ef9f0e32cbdb5ca7f8e49169cc2dde6599300bd (diff)
bup: Don't pass - to bup-split to make it read stdin
bup 0.25 does not accept that; and bup split reads from stdin by default if no file is given. I'm not sure what version of bup changed this. This only affected bup special remotes that were encrypted.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Bup.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 2249f5b7e..57f0092a6 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -105,7 +105,7 @@ pipeBup params inh outh = do
ExitSuccess -> return True
_ -> return False
-bupSplitParams :: Git.Repo -> BupRepo -> Key -> CommandParam -> Annex [CommandParam]
+bupSplitParams :: Git.Repo -> BupRepo -> Key -> [CommandParam] -> Annex [CommandParam]
bupSplitParams r buprepo k src = do
o <- getRemoteConfig r "bup-split-options" ""
let os = map Param $ words o
@@ -116,13 +116,13 @@ bupSplitParams r buprepo k src = do
store :: Git.Repo -> BupRepo -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool
store r buprepo k _f _p = do
src <- inRepo $ gitAnnexLocation k
- params <- bupSplitParams r buprepo k (File src)
+ params <- bupSplitParams r buprepo k [File src]
liftIO $ boolSystem "bup" params
storeEncrypted :: Git.Repo -> BupRepo -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool
storeEncrypted r buprepo (cipher, enck) k _p = do
src <- inRepo $ gitAnnexLocation k
- params <- bupSplitParams r buprepo enck (Param "-")
+ params <- bupSplitParams r buprepo enck []
liftIO $ catchBoolIO $
withEncryptedHandle cipher (L.readFile src) $ \h ->
pipeBup params (Just h) Nothing