diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/Propellor/Property/Borg.hs | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 532b83b6..d8c251dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (4.8.1) UNRELEASED; urgency=medium + + * Borg: Fix propigation of exit status of borg backup. + + -- Joey Hess <id@joeyh.name> Mon, 25 Sep 2017 16:38:17 -0400 + propellor (4.8.0) unstable; urgency=medium * DiskImage: Made a DiskImage type class, so that different disk image diff --git a/src/Propellor/Property/Borg.hs b/src/Propellor/Property/Borg.hs index 74d71e3d..e95ea87f 100644 --- a/src/Propellor/Property/Borg.hs +++ b/src/Propellor/Property/Borg.hs @@ -148,7 +148,7 @@ backup' dir repo crontimes extraargs kp = cronjob cronjob = Cron.niceJob ("borg_backup" ++ dir) crontimes (User "root") "/" $ "flock " ++ shellEscape lockfile ++ " sh -c " ++ shellEscape backupcmd lockfile = "/var/lock/propellor-borg.lock" - backupcmd = intercalate ";" $ concat + backupcmd = intercalate "&&" $ concat [ concatMap exportenv (runBorgEnv repo) , [createCommand] , if null kp then [] else [pruneCommand] |