mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix building without database.

Browse source 
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.
This commit is contained in:
Joey Hess 2015-08-23 15:39:29 -07:00
parent a4edec9b40
commit 0b7a8b72bb
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Fsck.hs
View file

@ -519,10 +519,10 @@ getStartTime u = do
data Incremental data Incremental
= NonIncremental = NonIncremental
| ScheduleIncremental Duration UUID Incremental
#ifdef WITH_DATABASE #ifdef WITH_DATABASE
| StartIncremental FsckDb.FsckHandle | StartIncremental FsckDb.FsckHandle
| ContIncremental FsckDb.FsckHandle | ContIncremental FsckDb.FsckHandle
| ScheduleIncremental Duration UUID Incremental
#endif #endif
prepIncremental :: UUID -> Maybe IncrementalOpt -> Annex Incremental prepIncremental :: UUID -> Maybe IncrementalOpt -> Annex Incremental

2
debian/changelog vendored
View file

@ -22,6 +22,8 @@ git-annex (5.20150813) UNRELEASED; urgency=medium
haskell program is unknown. haskell program is unknown.
* Reorder declaration to fix build with yesod-core > 1.4.13. * Reorder declaration to fix build with yesod-core > 1.4.13.
Thanks, Michael Alan Dorman. 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 -- Joey Hess <id@joeyh.name> Wed, 12 Aug 2015 14:31:01 -0400