Merge branch 'joeyconfig'

1 files changed, 6 insertions, 6 deletions

diff --git a/src/Propellor/Property/Obnam.hs b/src/Propellor/Property/Obnam.hs
index 9a391967..92c97f18 100644
--- a/src/Propellor/Property/Obnam.hs
+++ b/src/Propellor/Property/Obnam.hs
@@ -62,23 +62,23 @@ backup' dir crontimes params numclients = cronjob `describe` desc
 		unwords $ catMaybes
 			[ if numclients == OnlyClient
 				-- forcelock fails if repo does not exist yet
-				then Just $ forcelock ++ " 2>/dev/null ;"
+				then Just $ forcelockcmd ++ " 2>/dev/null ;"
 				else Nothing
-			, Just backup
+			, Just backupcmd
 			, if any isKeepParam params
-				then Just $ "&& " ++ forget
+				then Just $ "&& " ++ forgetcmd
 				else Nothing
 			]
-	forcelock = unwords $
+	forcelockcmd = unwords $
 		[ "obnam"
 		, "force-lock"
 		] ++ map shellEscape params
-	backup = unwords $
+	backupcmd = unwords $
 		[ "obnam"
 		, "backup"
 		, shellEscape dir
 		] ++ map shellEscape params
-	forget = unwords $
+	forgetcmd = unwords $
 		[ "obnam"
 		, "forget"
 		] ++ map shellEscape params