diff options
| -rw-r--r-- | Remote/Bup.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 5 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 diff --git a/debian/changelog b/debian/changelog index 420e7f62e..1712b3899 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low * uninit: Check and abort if there are symlinks to annexed content that are not checked into git. * webapp: Switched to using the same multicast IP address that avahi uses. + * bup: Don't pass - to bup-split to make it read stdin; bup 0.25 + does not accept that. -- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400 |