Merge branch 'master' into joeyconfig

1 files changed, 14 insertions, 14 deletions

diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index db5982cd..aaa83e6f 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -111,8 +111,8 @@ type Suite = String
 -- the same suite and the same architecture, so neither do we
 data SbuildSchroot = SbuildSchroot Suite Architecture
 
-instance Show SbuildSchroot where
-	show (SbuildSchroot suite arch) = suite ++ "-" ++ architectureToDebianArchString arch
+instance ConfigurableValue SbuildSchroot where
+	val (SbuildSchroot suite arch) = suite ++ "-" ++ architectureToDebianArchString arch
 
 -- | Whether an sbuild schroot should use ccache during builds
 --
@@ -151,7 +151,7 @@ built s@(SbuildSchroot suite arch) mirror cc =
   where
 	go :: Property DebianLike
 	go = check (unpopulated (schrootRoot s) <||> ispartial) $
-		property' ("built sbuild schroot for " ++ show s) make
+		property' ("built sbuild schroot for " ++ val s) make
 	make w = do
 		de <- liftIO standardPathEnv
 		let params = Param <$>
@@ -170,18 +170,18 @@ built s@(SbuildSchroot suite arch) mirror cc =
 	-- TODO we should kill any sessions still using the chroot
 	-- before destroying it (as suggested by sbuild-destroychroot)
 	deleted = check (not <$> unpopulated (schrootRoot s)) $
-		property ("no sbuild schroot for " ++ show s) $ do
+		property ("no sbuild schroot for " ++ val s) $ do
 			liftIO $ removeChroot $ schrootRoot s
 			liftIO $ nukeFile
-				("/etc/sbuild/chroot" </> show s ++ "-sbuild")
+				("/etc/sbuild/chroot" </> val s ++ "-sbuild")
 			makeChange $ nukeFile (schrootConf s)
 
 	enhancedConf =
-		combineProperties ("enhanced schroot conf for " ++ show s) $ props
+		combineProperties ("enhanced schroot conf for " ++ val s) $ props
 			& aliasesLine
 			-- enable ccache and eatmydata for speed
 			& ConfFile.containsIniSetting (schrootConf s)
-				( show s ++ "-sbuild"
+				( val s ++ "-sbuild"
 				, "command-prefix"
 				, intercalate "," commandPrefix
 				)
@@ -196,7 +196,7 @@ built s@(SbuildSchroot suite arch) mirror cc =
 			then ensureProperty w $
 				ConfFile.containsIniSetting
 					(schrootConf s)
-					( show s ++ "-sbuild"
+					( val s ++ "-sbuild"
 					, "aliases"
 					, aliases
 					)
@@ -263,7 +263,7 @@ updatedFor system = property' ("updated sbuild schroot for " ++ show system) $
 updated :: SbuildSchroot -> Property DebianLike
 updated s@(SbuildSchroot suite arch) =
 	check (doesDirectoryExist (schrootRoot s)) $ go
-	`describe` ("updated schroot for " ++ show s)
+	`describe` ("updated schroot for " ++ val s)
 	`requires` installed
   where
 	go :: Property DebianLike
@@ -283,13 +283,13 @@ updated s@(SbuildSchroot suite arch) =
 -- given suite and architecture, so we don't need the suffix to be random.
 fixConfFile :: SbuildSchroot -> Property UnixLike
 fixConfFile s@(SbuildSchroot suite arch) =
-	property' ("schroot for " ++ show s ++ " config file fixed") $ \w -> do
+	property' ("schroot for " ++ val s ++ " config file fixed") $ \w -> do
 		confs <- liftIO $ dirContents dir
 		let old = concat $ filter (tempPrefix `isPrefixOf`) confs
 		liftIO $ moveFile old new
 		liftIO $ moveFile
-			("/etc/sbuild/chroot" </> show s ++ "-propellor")
-			("/etc/sbuild/chroot" </> show s ++ "-sbuild")
+			("/etc/sbuild/chroot" </> val s ++ "-propellor")
+			("/etc/sbuild/chroot" </> val s ++ "-sbuild")
 		ensureProperty w $
 			File.fileProperty "replace dummy suffix" (map munge) new
   where
@@ -361,10 +361,10 @@ piupartsConf s@(SbuildSchroot _ arch) =
 
 	orig = "/etc/schroot/sbuild"
 	dir = "/etc/schroot/piuparts"
-	sec = show s ++ "-piuparts"
+	sec = val s ++ "-piuparts"
 	f = schrootPiupartsConf s
 	munge = replace "-sbuild]" "-piuparts]"
-	desc = "piuparts schroot conf for " ++ show s
+	desc = "piuparts schroot conf for " ++ val s
 
 	-- normally the piuparts schroot conf has no aliases, but we have to add
 	-- one, for dgit compatibility, if this is the default sid chroot