Joey Hess
ab5f7b05f5
Fix OSX dmg to include libraries needed by bundled gpg, lost in last release.
2016-03-07 12:55:01 -04:00
Joey Hess
9a8cdc3652
merge from propellor
2016-03-06 20:09:05 -04:00
Joey Hess
a07fd19ce9
dropkey --json
2016-03-06 12:58:36 -04:00
Joey Hess
acf74ae945
improve json when showStart' is given only a key
...
Before, the json contained file:key; change that to key:
If a file and a key are given, inclue both file: and key:
2016-03-06 12:57:24 -04:00
Joey Hess
78fa865721
dropkey: Add --batch.
2016-03-06 12:45:57 -04:00
Joey Hess
8a54643618
update flag list
2016-03-05 17:33:52 -04:00
Joey Hess
59bad9681b
i386ancient build switched to stack, has more flags enabled
2016-03-05 17:16:46 -04:00
Joey Hess
404ad86ef9
allow linuxstandalone to be used with stack built binary
2016-03-05 16:57:37 -04:00
Joey Hess
9ee367a814
switch to lts 5.5
2016-03-05 16:20:35 -04:00
Joey Hess
844e0b3ad9
add new deps
2016-03-05 16:17:14 -04:00
Joey Hess
35aad6ee7f
fix build with old ghc
2016-03-05 15:18:52 -04:00
Joey Hess
112caada86
another windows build fix
2016-03-05 15:08:37 -04:00
Joey Hess
e859ebe2b3
more windows build fixes
2016-03-05 13:57:43 -04:00
Joey Hess
ca18baecdb
fix windows build more
2016-03-05 12:32:06 -04:00
Joey Hess
0084e0f053
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-05 12:29:43 -04:00
Joey Hess
5f3fa4642e
close bug about removed code
2016-03-05 11:32:05 -04:00
Joey Hess
38d7df3374
add new deps
2016-03-05 11:29:14 -04:00
Joey Hess
9eecb4084e
changelog
2016-03-05 11:27:33 -04:00
Joey Hess
40c15871d5
remove LGPL, after removing the LGPLed file
2016-03-05 11:24:05 -04:00
Joey Hess
be80c29dbc
Merge branch 'no-cbits'
2016-03-05 11:22:32 -04:00
ellis@9dd4c3615b5ff78a457c5832488610886fd6b255
1d6ab9b065
2016-03-05 12:19:50 +00:00
ellis@9dd4c3615b5ff78a457c5832488610886fd6b255
d6bfa533b5
2016-03-05 12:18:48 +00:00
workspace
c2a0a900dd
Added a comment: same problem
2016-03-04 20:44:26 +00:00
Joey Hess
5716c39928
thought on reversing commits to adjusted branch
2016-03-04 11:31:26 -04:00
frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a
f49570857c
Added a comment
2016-03-04 14:06:17 +00:00
edward
c8f777a593
fix link
2016-03-04 10:44:54 +00:00
Joey Hess
51ddb84ca2
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-03 17:20:28 -04:00
Joey Hess
292414aa4f
devblog
2016-03-03 17:19:11 -04:00
Horus
0aec17ea55
Added a comment
2016-03-03 18:17:35 +00:00
Joey Hess
6237bffae5
fix windows build
2016-03-03 13:08:47 -04:00
acbg@8d58f794ce92f6be28b5dbd402059bc30262eb92
b1217e0a5a
Added a comment: Since which version does this apply?
2016-03-03 16:16:28 +00:00
Joey Hess
aa24e4f9a2
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-03 12:11:45 -04:00
Joey Hess
c1e439f8cc
fix windows build
2016-03-03 12:11:12 -04:00
Horus
23e2c0723e
2016-03-03 16:03:06 +00:00
frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a
f09c54aa8e
2016-03-03 13:01:05 +00:00
chip@9a7a3f3780ecacd7b38b0b0adad50046c9b2895b
8722bc865d
2016-03-03 06:00:05 +00:00
chip@9a7a3f3780ecacd7b38b0b0adad50046c9b2895b
c81b2b9213
2016-03-03 05:59:02 +00:00
mih
554d9339b6
Added a comment: Thanks
2016-03-02 19:30:49 +00:00
Joey Hess
17a3885119
comment
2016-03-02 13:15:24 -04:00
Joey Hess
223eaf2efd
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-02 12:25:59 -04:00
Joey Hess
baa9954e06
Fix metadata hook behavior when multiple files are added at once. Thanks, Klaus Ethgen.
2016-03-02 12:25:41 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
bd83c16586
Added a comment
2016-03-01 22:40:45 +00:00
Joey Hess
12f7c0724f
followup
2016-03-01 16:58:19 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
cd067a57a0
Added a comment
2016-03-01 20:43:17 +00:00
Joey Hess
181f9457ee
update
2016-03-01 16:42:36 -04:00
Joey Hess
e35001ad6b
followup
2016-03-01 16:34:41 -04:00
Joey Hess
5b664053e0
comment
2016-03-01 16:24:04 -04:00
Joey Hess
84de8bd2d0
clarify
2016-03-01 16:22:47 -04:00
Joey Hess
6f4de0c201
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-01 15:36:54 -04:00
Joey Hess
3334130368
Fix shared lock file FD leak.
...
This fixes behavior in this situation:
l1 <- lockShared Nothing "lck"
l2 <- lockShared Nothing "lck"
dropLock l1
dropLock l2
Before, the lock was dropped upon the second dropLock call, but the fd
remained open, and would never be closed while the program was running.
Fixed by a rather round-about method, but it should work well enough.
It would have been simpler to open open the shared lock once, and not open
it again in the second call to lockShared. But, that's difficult to do
atomically.
This also affects Windows and PID locks, not just posix locks.
In the case of pid locks, multiple calls to waitLock within the same
process are allowed because the side lock is locked using a posix lock,
and so multiple exclusive locks can be taken in the same process. So,
this change fixes a similar problem with pid locks.
l1 <- waitLock (Seconds 1) "lck"
l2 <- waitLock (Seconds 1) "lck"
dropLock l1
dropLock l2
Here the l2 side lock fd remained open but not locked,
although the pid lock file was removed. After this change, the second
dropLock will close both fds to the side lock, and delete the pidlock.
2016-03-01 15:31:39 -04:00
