From cf3fc9b8e9a9e93c6784f78e0ba48f518d3003f7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 4 Apr 2014 00:08:30 -0400
Subject: [PATCH] fix file mode bug

---
 Propellor/Property/File.hs | 12 ++++++++++--
 debian/changelog           |  9 +++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Propellor/Property/File.hs b/Propellor/Property/File.hs
index af4f554..80c69d9 100644
--- a/Propellor/Property/File.hs
+++ b/Propellor/Property/File.hs
@@ -2,6 +2,8 @@ module Propellor.Property.File where
 
 import Propellor
 
+import System.Posix.Files
+
 type Line = String
 
 -- | Replaces all the content of a file.
@@ -32,13 +34,19 @@ fileProperty :: Desc -> ([Line] -> [Line]) -> FilePath -> Property
 fileProperty desc a f = Property desc $ go =<< doesFileExist f
   where
 	go True = do
-		ls <- lines <$> catchDefaultIO [] (readFile f)
+		ls <- lines <$> readFile f
 		let ls' = a ls
 		if ls' == ls
 			then noChange
-			else makeChange $ viaTmp writeFile f (unlines ls')
+			else makeChange $ viaTmp updatefile f (unlines ls')
 	go False = makeChange $ writeFile f (unlines $ a [])
 
+	-- viaTmp makes the temp file mode 600.
+	-- Replicate the original file mode before moving it into place.
+	updatefile f' content = do
+		writeFile f' content
+		getFileStatus f >>= setFileMode f' . fileMode
+
 -- | Ensures a directory exists.
 dirExists :: FilePath -> Property
 dirExists d = check (not <$> doesDirectoryExist d) $ Property (d ++ " exists") $
diff --git a/debian/changelog b/debian/changelog
index 09d8492..a126e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (0.2.2) UNRELEASED; urgency=medium
+
+  * Now supports provisioning docker containers with architecture/libraries
+    that do not match the outside host.
+  * Fixed a bug that caused file modes to be set to 600 when propellor
+    modified the file.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 04 Apr 2014 00:06:26 -0400
+
 propellor (0.2.1) unstable; urgency=medium
 
   * First release with Debian package.