Always try to thaw content, even when annex.crippledfilesystem is set.

2 files changed, 16 insertions, 4 deletions

diff --git a/Annex/Content.hs b/Annex/Content.hs
index 103fa264d..d14e87adc 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -951,8 +951,13 @@ chmodContent file = unlessM crippledFileSystem $
 {- Allows writing to an annexed file that freezeContent was called on
  - before. -}
 thawContent :: FilePath -> Annex ()
-thawContent file = unlessM crippledFileSystem $
-	withShared go
+thawContent file = ifM crippledFileSystem
+	-- Probably cannot change mode on crippled filesystem,
+	-- but if file modes are supported, the content may be frozen
+	-- so try to thaw it.
+	( void $ tryNonAsync $ withShared go
+	, withShared go
+	)
   where
 	go GroupShared = liftIO $ groupWriteRead file
 	go AllShared = liftIO $ groupWriteRead file
diff --git a/Annex/Perms.hs b/Annex/Perms.hs
index 159cc328a..3905b7af9 100644
--- a/Annex/Perms.hs
+++ b/Annex/Perms.hs
@@ -92,8 +92,15 @@ freezeContentDir file = unlessM crippledFileSystem $
 	go _ = liftIO $ preventWrite dir
 
 thawContentDir :: FilePath -> Annex ()
-thawContentDir file = unlessM crippledFileSystem $
-	liftIO $ allowWrite $ parentDir file
+thawContentDir file = ifM crippledFileSystem
+	-- Probably cannot change mode on crippled filesystem,
+	-- but if file modes are supported, the directory may be frozen,
+	-- so try to thaw it.
+	( void $ tryNonAsync go
+	, go
+	)
+  where
+	go = liftIO $ allowWrite $ parentDir file
 
 {- Makes the directory tree to store an annexed file's content,
  - with appropriate permissions on each level. -}