Commit graph

25250 commits

Author SHA1 Message Date
Joey Hess
ca7614ff2c android still not building, revert breaking change 2015-08-24 10:57:22 -07:00
Joey Hess
e3dedd3c89 better android build fix 2015-08-24 10:56:08 -07:00
Joey Hess
384e435adf Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-24 10:54:40 -07:00
Joey Hess
5ef4fe1746 android ghc doesn't support -j flag, fix build 2015-08-24 10:54:00 -07:00
vincent.mcintyre@1318ebde5cb96fc17e59dfa86f399f5634b1facc
fc7bfc27e1 2015-08-24 13:11:24 +00:00
Joey Hess
eb173757b4 Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-23 15:45:55 -07:00
Joey Hess
0b7a8b72bb 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.
2015-08-23 15:39:29 -07:00
Ben Boeckel
a4edec9b40 ImportFeed: fix signature of mkquvi without libquvi 2015-08-23 15:32:10 -07:00
sunny256
a5c88259b4 Add bug report about hPutChar error message when using git annex fsck --incremental 2015-08-23 20:57:06 +00:00
tanen
1f923de11d Added a comment 2015-08-23 20:34:20 +00:00
Joey Hess
7f39a8cb7a Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-23 10:45:57 -07:00
Joey Hess
d20cd4659a Reorder declaration to fix build with yesod-core > 1.4.13. Thanks, Michael Alan Dorman. 2015-08-23 10:44:09 -07:00
Joey Hess
966934d143 Merge remote-tracking branch 'mdorman/yesod-core-fix' 2015-08-23 10:43:00 -07:00
mdorman@ddbe259e8f6e03351350a04515c67f7957abf736
e6e6cf5712 Added a comment: Fix for this issue 2015-08-23 17:26:34 +00:00
Michael Alan Dorman
a6bea7f767 Fix issue with yesod-core > 1.4.13.
yesod-core-1.4.14 changed the Template Haskell behind the expansion of
mkYesodData, such that it now must have the application data type
declared before it is called.  This change simply moves the call to
mkYesodData to be after the data type it wants to access is declared.

https://github.com/yesodweb/yesod/issues/1059 has some discussion of the
issue from the Yesod side.
2015-08-23 12:33:25 -04:00
Joey Hess
d85480d8c4 Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-23 08:58:01 -07:00
mdorman@ddbe259e8f6e03351350a04515c67f7957abf736
4ba9bf853d Added a comment: In fact, the problem *is* the yesod update 2015-08-22 10:37:20 +00:00
Joey Hess
68efd5f5ce Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-21 10:11:11 -04:00
mdorman@ddbe259e8f6e03351350a04515c67f7957abf736
9bfa2fccb2 Something amiss in TH instantiation? 2015-08-21 09:34:10 +00:00
Joey Hess
7be58b5e11 make sync --no-content be accepted
It's the default, but this is a step toward changing that default later..
2015-08-20 17:21:14 -04:00
Joey Hess
3435403089 response 2015-08-20 11:21:59 -04:00
anarcat
52ded96c13 Added a comment: a bit more info and solutions 2015-08-20 14:09:54 +00:00
https://me.yahoo.com/a/yx5Y6EI1t.759Jsu63ZWqYclCmpOmxxd.ramtw--#7114a
cfa9c2bf1f Added a comment 2015-08-20 09:37:22 +00:00
Antoine Beaupré
30c1a83ef4 give up on fixing the link and remove slash from original URL 2015-08-19 19:56:01 -04:00
Antoine Beaupré
21c020c085 try to fix link 2015-08-19 19:54:05 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
738a92678e Added a comment: seems just ignore errors while adding urls to "unsupported" urls 2015-08-19 21:59:09 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
c5876987e5 Added a comment 2015-08-19 20:50:08 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
0ca6f330ec 2015-08-19 20:46:21 +00:00
anarcat
227b6f6199 Added a comment: works with sync --content, but the assistant is slow to pickup tracking info 2015-08-19 20:29:46 +00:00
Joey Hess
96a572cf5c devblog 2015-08-19 15:10:44 -04:00
Joey Hess
547aab9591 working example 2015-08-19 14:55:03 -04:00
Joey Hess
708e98016b Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-19 14:49:11 -04:00
Joey Hess
2b01e61774 response 2015-08-19 14:44:26 -04:00
Joey Hess
99b242c253 response 2015-08-19 14:29:22 -04:00
Joey Hess
8e42d9af61 response 2015-08-19 14:26:11 -04:00
Joey Hess
790d31c158 followup 2015-08-19 14:19:18 -04:00
Joey Hess
6dad09a823 disable whereisKey for encrypted or chunked remotes
This only makes sense for public repos, that are not chunked, so
that there's a 1:1 from Key in the git-annex repo to file on the remote.
Rather than making every remote implementation deal with that, just disable
whereisKey when it doesn't make sense.
2015-08-19 14:16:01 -04:00
anarcat
0f21ebebeb Added a comment 2015-08-19 18:13:23 +00:00
Joey Hess
fb8fec2a7b exclude thanks page to avoid lintian error about embedded gif 2015-08-19 14:12:22 -04:00
Joey Hess
ac8e2b2396 comment 2015-08-19 13:56:48 -04:00
Joey Hess
5aca630ecc Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-19 13:54:15 -04:00
Joey Hess
485465107a Makefile: Pass LDFLAGS, CFLAGS, and CPPFLAGS through ghc and on to ld, cc, and cpp.
As a result of the Makefile changes, the Debian package is built
with various hardening options. Although their benefit to a largely
haskell program is unknown.
2015-08-19 13:53:57 -04:00
https://me.yahoo.com/a/aMQG8Dgn35w1KhItNb2j1vtCQaIhEEY-#80cbd
a322da5cbe 2015-08-19 17:52:59 +00:00
anarcat
b853a7708d Added a comment 2015-08-19 17:17:50 +00:00
Joey Hess
fec1568054 typo 2015-08-19 13:17:07 -04:00
Joey Hess
141071d1d3 response 2015-08-19 13:16:01 -04:00
Joey Hess
a1f36054c6 comment 2015-08-19 13:07:35 -04:00
anarcat
cecaa8bf21 Added a comment: clarifications 2015-08-19 16:57:50 +00:00
Joey Hess
b2a78ae249 forwarded 2015-08-19 12:54:15 -04:00
Joey Hess
9f639993b6 move comment 2015-08-19 12:50:18 -04:00