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

Fix build with wai 0.3.0.

Browse source 
This version of wai changed the type of Middleware, so I cannot seem
to liftIO inside it. So, got rid of a lot of not really needed
complexity to use System.Log.Logger's logging stuff, and just use
the standard wai stdout logger when debug logging is enabled.

Format may change some, and it logs http to stdout instead of stderr
now. Doesn't matter for the webapp since both go to the same log anyway.
This commit is contained in:
Joey Hess 2014-06-11 01:29:00 -04:00
parent 2d142b4368
commit 8ff9938d97
5 changed files with 12 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -6,6 +6,7 @@ git-annex (5.20140607) UNRELEASED; urgency=medium
* Avoid bad commits after interrupted direct mode sync (or merge).
* Windows: Fix opening webapp when repository is in a directory with
spaces in the path.
* Fix build with wai 0.3.0.
-- Joey Hess <joeyh@debian.org> Mon, 09 Jun 2014 14:44:09 -0400

2
debian/control vendored
View file

@ -40,7 +40,7 @@ Build-Depends:
libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-wai-logger-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-securemem-dev,
libghc-byteable-dev,
libghc-dns-dev,