From c6fbed48a1b7d41ec23916dfee33e5b64846d7f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 24 Oct 2012 10:59:25 -0400
Subject: [PATCH] bugfix: Don't fail transferring content from read-only repos.
 Closes: #691341

This used to work, but got broken when the transfer info files were added,
as it failed writing them on the readonly filesystem.
---
 Logs/Transfer.hs | 12 ++++++++----
 debian/changelog |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index e9922422fd..99b5a9bba8 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -96,6 +96,9 @@ download u key file shouldretry a = runTransfer (Transfer Download u key) file s
  -
  - If the transfer action returns False, the transfer info is 
  - left in the failedTransferDir.
+ -
+ - An upload can be run from a read-only filesystem, and in this case
+ - no transfer information or lock file is used.
  -}
 runTransfer :: Transfer -> Maybe FilePath -> RetryDecider -> (MeterUpdate -> Annex Bool) -> Annex Bool
 runTransfer t file shouldretry a = do
@@ -107,7 +110,7 @@ runTransfer t file shouldretry a = do
 	unless ok $ failed info
 	return ok
 	where
-		prep tfile mode info = do
+		prep tfile mode info = catchMaybeIO $ do
 			fd <- openFd (transferLockFile tfile) ReadWrite (Just mode)
 				defaultFileFlags { trunc = True }
 			locked <- catchMaybeIO $
@@ -116,7 +119,8 @@ runTransfer t file shouldretry a = do
 				error $ "transfer already in progress"
 			writeTransferInfoFile info tfile
 			return fd
-		cleanup tfile fd = do
+		cleanup _ Nothing = noop
+		cleanup tfile (Just fd) = do
 			void $ tryIO $ removeFile tfile
 			void $ tryIO $ removeFile $ transferLockFile tfile
 			closeFd fd
@@ -149,7 +153,7 @@ runTransfer t file shouldretry a = do
 mkProgressUpdater :: Transfer -> TransferInfo -> Annex (MeterUpdate, FilePath, MVar Integer)
 mkProgressUpdater t info = do
 	tfile <- fromRepo $ transferFile t
-	createAnnexDirectory $ takeDirectory tfile
+	_ <- tryAnnex $ createAnnexDirectory $ takeDirectory tfile
 	mvar <- liftIO $ newMVar 0
 	return (liftIO . updater tfile mvar, tfile, mvar)
 	where
@@ -157,7 +161,7 @@ mkProgressUpdater t info = do
 			if (bytes - oldbytes >= mindelta)
 				then do
 					let info' = info { bytesComplete = Just bytes }
-					writeTransferInfoFile info' tfile
+					_ <- tryIO $ writeTransferInfoFile info' tfile
 					return bytes
 				else return oldbytes
 		{- The minimum change in bytesComplete that is worth
diff --git a/debian/changelog b/debian/changelog
index 1712b3899e..128adefef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low
   * 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.
+  * bugfix: Don't fail transferring content from read-only repos.
+    Closes: #691341
 
  -- Joey Hess <joeyh@debian.org>  Wed, 17 Oct 2012 14:24:10 -0400