Merge branch 'master' into desymlink

8 files changed, 16 insertions, 16 deletions

diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 116a43321..e14185017 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -52,7 +52,7 @@ gen r u c = do
 			{ uuid = u'
 			, cost = cst
 			, name = Git.repoDescribe r
- 			, storeKey = store r buprepo
+			, storeKey = store r buprepo
 			, retrieveKeyFile = retrieve buprepo
 			, retrieveKeyFileCheap = retrieveCheap buprepo
 			, removeKey = remove
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index c202ddb1d..946df6111 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -45,7 +45,7 @@ gen r u c = do
 			uuid = u,
 			cost = cst,
 			name = Git.repoDescribe r,
- 			storeKey = store dir chunksize,
+			storeKey = store dir chunksize,
 			retrieveKeyFile = retrieve dir chunksize,
 			retrieveKeyFileCheap = retrieveCheap dir chunksize,
 			removeKey = remove dir,
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 952fbf29f..db73247a1 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -415,7 +415,7 @@ rsyncParams r = do
 	o <- getRemoteConfig r "rsync-options" ""
 	return $ options ++ map Param (words o)
   where
- 	-- --inplace to resume partial files
+	-- --inplace to resume partial files
 	options = [Params "-p --progress --inplace"]
 
 commitOnCleanup :: Git.Repo -> Annex a -> Annex a
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index 0a41b0083..05cdf8978 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -49,7 +49,7 @@ gen r u c = new <$> remoteCost r veryExpensiveRemoteCost
 			uuid = u,
 			cost = cst,
 			name = Git.repoDescribe r,
- 			storeKey = store this,
+			storeKey = store this,
 			retrieveKeyFile = retrieve this,
 			retrieveKeyFileCheap = retrieveCheap this,
 			removeKey = remove this,
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index e6e1231a8..8f9aaafd6 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -40,7 +40,7 @@ gen r u c = do
 			uuid = u,
 			cost = cst,
 			name = Git.repoDescribe r,
- 			storeKey = store hooktype,
+			storeKey = store hooktype,
 			retrieveKeyFile = retrieve hooktype,
 			retrieveKeyFileCheap = retrieveCheap hooktype,
 			removeKey = remove hooktype,
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index 2ad5482ec..4c61d8e62 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -49,7 +49,7 @@ gen r u c = do
 			{ uuid = u
 			, cost = cst
 			, name = Git.repoDescribe r
- 			, storeKey = store o
+			, storeKey = store o
 			, retrieveKeyFile = retrieve o
 			, retrieveKeyFileCheap = retrieveCheap o
 			, removeKey = remove o
@@ -168,7 +168,7 @@ checkPresent r o k = do
 	-- to connect, and the file not being present.
 	Right <$> check
   where
- 	check = untilTrue (rsyncUrls o k) $ \u -> 
+	check = untilTrue (rsyncUrls o k) $ \u -> 
 		liftIO $ catchBoolIO $ do
 			withQuietOutput createProcessSuccess $
 				proc "rsync" $ toCommand $
@@ -210,8 +210,8 @@ rsyncRemote o callback params = do
 	ps = rsyncOptions o ++ defaultParams ++ params
 
 {- To send a single key is slightly tricky; need to build up a temporary
-   directory structure to pass to rsync so it can create the hash
-   directories. -}
+ - directory structure to pass to rsync so it can create the hash
+ - directories. -}
 rsyncSend :: RsyncOpts -> MeterUpdate -> Key -> FilePath -> Annex Bool
 rsyncSend o callback k src = withRsyncScratchDir $ \tmp -> do
 	let dest = tmp </> Prelude.head (keyPaths k)
@@ -220,7 +220,7 @@ rsyncSend o callback k src = withRsyncScratchDir $ \tmp -> do
 	rsyncRemote o (Just callback)
 		[ Param "--recursive"
 		, partialParams
- 		  -- tmp/ to send contents of tmp dir
+		-- tmp/ to send contents of tmp dir
 		, Param $ addTrailingPathSeparator tmp
 		, Param $ rsyncUrl o
 		]
diff --git a/Remote/S3.hs b/Remote/S3.hs
index e50145f61..345d93872 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -49,7 +49,7 @@ gen r u c = new <$> remoteCost r expensiveRemoteCost
 			uuid = u,
 			cost = cst,
 			name = Git.repoDescribe r,
- 			storeKey = store this,
+			storeKey = store this,
 			retrieveKeyFile = retrieve this,
 			retrieveKeyFileCheap = retrieveCheap this,
 			removeKey = remove this,
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index 391027d78..70faa7539 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -55,7 +55,7 @@ gen r u c = new <$> remoteCost r expensiveRemoteCost
 			uuid = u,
 			cost = cst,
 			name = Git.repoDescribe r,
- 			storeKey = store this,
+			storeKey = store this,
 			retrieveKeyFile = retrieve this,
 			retrieveKeyFileCheap = retrieveCheap this,
 			removeKey = remove this,
@@ -314,10 +314,10 @@ getCreds c u = getRemoteCredPairFor "webdav" c (davCreds u)
 
 davCreds :: UUID -> CredPairStorage
 davCreds u = CredPairStorage
-        { credPairFile = fromUUID u
-        , credPairEnvironment = ("WEBDAV_USERNAME", "WEBDAV_PASSWORD")
-        , credPairRemoteKey = Just "davcreds"
-        }
+	{ credPairFile = fromUUID u
+	, credPairEnvironment = ("WEBDAV_USERNAME", "WEBDAV_PASSWORD")
+	, credPairRemoteKey = Just "davcreds"
+	}
 
 setCredsEnv :: (String, String) -> IO ()
 setCredsEnv creds = setEnvCredPair creds $ davCreds undefined