summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Obnam.hs
diff options
context:
space:
mode:
authorJoey Hess2016-02-07 22:36:24 -0400
committerJoey Hess2016-02-07 22:36:24 -0400
commitb0be26473ee303afa0ceab4076e024e79daecb98 (patch)
treeab186eb7ab72e365457c14241709d4acf78f78a5 /src/Propellor/Property/Obnam.hs
parenta568c7c0367b1ef6f01d0e8e638bb0f3fc7b2cb8 (diff)
parentb493414d30c7aef37af904e55316436554fe54b2 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Obnam.hs')
-rw-r--r--src/Propellor/Property/Obnam.hs12
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