summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Bup.hs2
-rw-r--r--Remote/Helper/Encryptable.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 77d506d7c..f5c802e09 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -257,7 +257,7 @@ bup2GitRemote r
where
bits = split ":" r
host = Prelude.head bits
- dir = join ":" $ drop 1 bits
+ dir = intercalate ":" $ drop 1 bits
-- "host:~user/dir" is not supported specially by bup;
-- "host:dir" is relative to the home directory;
-- "host:" goes in ~/.bup
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs
index b9a08bea6..5c6d70e9b 100644
--- a/Remote/Helper/Encryptable.hs
+++ b/Remote/Helper/Encryptable.hs
@@ -123,7 +123,7 @@ storeCipher c (SharedCipher t) = M.insert "cipher" (toB64 t) c
storeCipher c (EncryptedCipher t ks) =
M.insert "cipher" (toB64 t) $ M.insert "cipherkeys" (showkeys ks) c
where
- showkeys (KeyIds l) = join "," l
+ showkeys (KeyIds l) = intercalate "," l
{- Extracts an StorableCipher from a remote's configuration. -}
extractCipher :: RemoteConfig -> Maybe StorableCipher