diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-23 15:39:29 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-23 15:39:29 -0700 |
| commit | 0881190963d3020dd27ed477f2569ce1f9abd3f1 (patch) | |
| tree | b175e1271eeb809c09a5c94f291c3706f886ae05 | |
| parent | 1d808de8cdb6eb31e6f7713970d09376ead7e34f (diff) | |
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.
| -rw-r--r-- | Command/Fsck.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index c3b73edb5..a522f5349 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 23e17c540..d61c51754 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 <id@joeyh.name> Wed, 12 Aug 2015 14:31:01 -0400 |