From 0b7a8b72bb9fd2ea9668a08438b8e968274ce984 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Aug 2015 15:39:29 -0700 Subject: [PATCH] Fix building without database. Ben Boeckel had a patch, but.. Actually, that was not the only place that used ScheduleIncremental when built w/o database. Since the data type doesn't need database stuff, I've instead fixed this build problem by exposing the ScheduleIncremental constructor to database-less builds. --- Command/Fsck.hs | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Command/Fsck.hs b/Command/Fsck.hs index c3b73edb57..a522f53497 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -519,10 +519,10 @@ getStartTime u = do data Incremental = NonIncremental + | ScheduleIncremental Duration UUID Incremental #ifdef WITH_DATABASE | StartIncremental FsckDb.FsckHandle | ContIncremental FsckDb.FsckHandle - | ScheduleIncremental Duration UUID Incremental #endif prepIncremental :: UUID -> Maybe IncrementalOpt -> Annex Incremental diff --git a/debian/changelog b/debian/changelog index 23e17c5408..d61c517541 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ git-annex (5.20150813) UNRELEASED; urgency=medium haskell program is unknown. * Reorder declaration to fix build with yesod-core > 1.4.13. Thanks, Michael Alan Dorman. + * Fix building without quvi and without database. + Thanks, Ben Boeckel. -- Joey Hess Wed, 12 Aug 2015 14:31:01 -0400