mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32102 commits 13 branches 442 tags 103 MiB
Commit graph

32102 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
9f3a346f25
fix nested exception bug 
Fix reversion introduced in version 6.20180316 that caused git-annex to
stop processing files when unable to contact a ssh remote.

The bug was not in any of the changed lines, but this one in inAnnex:

P2PHelper.checkpresent (Ssh.runProto rmt connpool (cantCheck rmt) fallback) key

cantCheck throws an exception, but that parameter to runProto expects a
value, which it returns. So, inAnnex is returning a Bool containing an
exception. This defeats the usual checks for checkPresent throwing an
exception, crashing git-annex.

Fixed by making runProto take an `Annex a` instead of an `a`, so
passing cantCheck to it doesn't nest exceptions.

This commit was sponsored by andrea rota.
 2018-07-03 13:10:43 -04:00
Joey Hess
edd257dcfb
response 2018-07-03 12:33:30 -04:00
Joey Hess
8a201c5cc4
close 2018-07-03 12:29:57 -04:00
Joey Hess
6b42533779
point to ikiwiki bug report 2018-07-02 13:25:30 -04:00
Joey Hess
73820a1d7e
add 2018-07-02 12:45:29 -04:00
Joey Hess
21161ba01a
response 2018-07-02 12:43:55 -04:00
Joey Hess
4b415a94b0
Merge branch 'master' of ssh://git-annex.branchable.com 2018-07-02 12:34:49 -04:00
Joey Hess
df1ed30549
remove comment to deleted non-bug 2018-07-02 12:34:29 -04:00
Joey Hess
ba0745b5c2
S3: fix documentation of publicurl 
5f0f063a7a documented it as being
configured automatically, but the code never did that. Rather than try
to hard-code whatever urls amazon  uses for its buckets, it seems better
to ask the user to find the url and set it.
 2018-07-02 12:30:39 -04:00
Joey Hess
0a875d81e5
response 2018-07-02 12:11:02 -04:00
Joey Hess
a7d8111430
comment 2018-07-02 12:08:50 -04:00
jasonb885
13342bc2ac Added a comment: oh 2018-07-02 01:08:38 +00:00
Joey Hess
841788cad4
add transformers to setup-depends 
per Peter Simons:

Setup.hs depends on 'transformers' for versions of base
prior to 4.9.x so that Control.Monad.IO.Class can be included. Just
adding the library to 'setup-depends' fixes the build with older
compilers like GHC 7.10.3.
 2018-07-01 13:08:40 -04:00
Joey Hess
14557a3ff6
git-annex.cabal: Fix network version. 
Needed for hostAddressToTuple.

Which means the build flag for the network-uri split is no longer needed.
 2018-07-01 13:07:24 -04:00
https://launchpad.net/~liori
7c03156fa4 Added a comment: The meaning of "safe" 2018-06-28 23:27:05 +00:00
Joey Hess
f61eae8afd
Merge branch 'master' of ssh://git-annex.branchable.com 2018-06-28 13:01:39 -04:00
Joey Hess
a63bbd868b
make addurl of media url fail when youtube-dl is disabled 
addurl: When security configuration prevents downloads with youtube-dl,
still check if the url is one that it supports, and fail downloading it,
instead of downloading the raw web page.
 2018-06-28 13:01:18 -04:00
Joey Hess
2c62f8e63d
remove empty tmp workdir on failure 
No point in keeping an empty tmp workdir around.

The associated tmp object file is retained even if empty, didn't want to
deal with any possible races with something else downloading to that
file at the same time this would check if it's empty. Anyhow, temp
object files are normally retained, and this will get cleaned out the
same way those do, by dropunused.
 2018-06-28 12:58:11 -04:00
Joey Hess
79ac177ea5
improve tmp file cleanup 
If youtubeDl fails, remove the tmp file. Here tmp is the
html file downloaded to check if the url is html, not what youtube-dl
might have started to download. If the tmp file were retained, a
re-run of addurl would try to resume downloading it, which the web
server might not support, causing the resume to fail.
And it's a smallish html page anyway so no benefit to
keeping it for such a resume.
 2018-06-28 12:51:51 -04:00
abimelech@632162f535b3bbc90e3336b14ceef969c41c05a2
f6638a6349 Added a comment: I've been using amazonka-glacier to stream uploads to glacier 2018-06-27 21:50:46 +00:00
Joey Hess
181e9019d3
Merge branch 'master' of ssh://git-annex.branchable.com 2018-06-26 21:08:21 -04:00
andrew
3e88e1ffc1 removed 2018-06-26 23:27:57 +00:00
andrew
83e20831ee 2018-06-26 23:03:24 +00:00
Joey Hess
8d509f8a61
Merge branch 'later' 2018-06-26 12:11:21 -04:00
Joey Hess
b091dac130
note for later 2018-06-26 12:10:09 -04:00
Joey Hess
4f3b9db725
Merge branch 'master' of ssh://git-annex.branchable.com 2018-06-26 11:09:50 -04:00
Joey Hess
1820cb2cdf
Merge branch 'master' of ssh://git-annex.branchable.com 2018-06-26 11:08:55 -04:00
Joey Hess
a1b55056fc
Make Build/BuildVersion update embedded version number 
This way, autobuilders can run it before building, in a tree where
git-annex was already built, and get the current git rev embedded in the
build.

Before, the version number only updated when the setup program was run,
which was up to cabal and not on every build.
 2018-06-26 10:36:54 -04:00
Joey Hess
7ecbb6bc20
stop using git commit date as version 
This turns out to have been prolimatic because building from a git tag
would make a git-annex that claimed a different version than the tag's
version.

The git rev is still included in the version, and people who want
to know the exact tree that was built can just use that, so there's no
real benefit to automatically advancing the date part of the version.
 2018-06-26 10:11:28 -04:00
Joey Hess
87b329e451
remove code to update version in cabal file 
I have not used this when making releases for a long time.
 2018-06-26 10:04:42 -04:00
CandyAngel
b356b2405c Added a comment 2018-06-26 10:38:21 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
5162395494 Added a comment: Not working on OnePlus 5T either 2018-06-26 10:32:09 +00:00
Joey Hess
c913f39dc8 tagging git-annex 6.20180626 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEKKUAw1IH6rcvbA8l2xLbD/BfjzgFAlsxuvMACgkQ2xLbD/Bf
 jzi5ig/5Ade5LcRZTW6mGVG6u4rqEW3/I5Mj5m66YO+oPDY8AKPou90e/pagoK3r
 IPL4+VftlZCP4EFFvmp5zz/H4tFV+D+wh3iU0QOMuKLN+3pBgawNm9pKNHSW6U8B
 yao+Ztydo4BPmws2SIusEjVq5MAsS5uq+zDW837MsOuQn+RMuaekU4ryhlp3HDGF
 IkcwfoTZCKgXnv+eOzsrH8vFXHYWOFUzf22KrdaDPGQ7K13jqYk//2EjlEdBWv74
 o00BNRNK+vrp5syCFwxtGVgNPssnDkeGlPn6CCqo/erR3e5hYxFVVZpMQJs9W+7i
 yQK5/0OkkrTnknN+hnf08RUTfiI7jssY96lsUPw3qZcrcRNyBGE1vgeP+hLvO5vu
 7RcIwydts3wHrWNlPL2o6lvShItqzrhl9mMELlcsXSh+gU3DifmRwPiBTqu5dwMg
 LczlM0+AyfT1IK0JpxaxgZwzuKUyJuvYX4THUZkT0Bx/XGhrc1zv/Io3qRR4vHt+
 NIbMJqEiJHeGGfdqvrb3rR2liYUwxW9ndRnndNHJS7FxyPncIteLf1yK5Awl/G7c
 dMGWSDhgXxIbMaVKqFhWBZEmEhNn46eJXCH8vJF6zVU22Lr2ZliRKnOG7n9CPoa8
 4c6lxkr8HxtOMZ8MQmmv5oSiUh77Tcu1rfhpF5Igo7yoEqMTUa0=
 =0roY
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEKKUAw1IH6rcvbA8l2xLbD/BfjzgFAlsxu1QACgkQ2xLbD/Bf
 jziFjA/+PuNTVc4gJm1fGdMv/cQXjUgMqDhXc551OgYJvZpm14OKOw2ucVQb14Tg
 8/HCC+F12XqINiqlVFXmTKXExbaF9lN9f5pnqj6nhe72ZVfTZG6oFpAsKpmB8fyW
 e5vuJgTqCNYy69oTSf7jlGOueOiyxPp2pkZdyaykgC76cmzM35nMo4Nxfs8zwol0
 E7MwpGXveBjGmoN84q0R9hgNfcTxL3e3k2UzMXr5Pfsej97bh4rBqxs5S+578SWa
 WK3y2EMci7NMQUeJzI4iI9AAIpyMJ/SaqKRc1Z/DSc0csPmpDjjbYEHHNoOTpRDV
 fKUwqsLN5TG5mZosruAxzLG1Xw+y67QPz/788Fi+6+mwhW7BiWyoU+aPhYxhVUVU
 lsuMNo/ITgWHRsgQ88hHQLZCKraDgOO2Ema6NdzFH4UNH5nrR5fWM/EqOHbeqFPT
 6qLKLBhW0HHjm5DBdPjLhRbKQtZ9ggqOYRRzl5Tkzo3sDw+dd3ODiKfaePABhG+w
 5sTq+pFVDh6dzO0ZpdYP36KaRnnaGzDaGGqQ29Eaf88PLBoPySmqAvsdrgyYXQsh
 nnYBv5n3tZRt32d5BbeilDxMb0DJAILKciohT5qsIyyeLwLNkn+2veyO/68r1OvN
 aPc/n4I4rsF9+dAPZqEfNOZcQhlVpXi7JIQLxH2DTp7nW6CAHXc=
 =Rxbj
 -----END PGP SIGNATURE-----

Merge tag '6.20180626'

tagging git-annex 6.20180626

# gpg: Signature made Tue Jun 26 00:02:59 2018 JEST
# gpg:                using RSA key 28A500C35207EAB72F6C0F25DB12DB0FF05F8F38
# gpg: Good signature from "Joey Hess <joeyh@joeyh.name>" [unknown]
# gpg:                 aka "Joey Hess <id@joeyh.name>" [unknown]
# gpg:                 aka "Joey Hess <joey@kitenet.net>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E85A 5F63 B31D 24C1 EBF0  D81C C910 D922 2512 E3C7
#      Subkey fingerprint: 28A5 00C3 5207 EAB7 2F6C  0F25 DB12 DB0F F05F 8F38
 2018-06-26 00:04:36 -04:00
Joey Hess
df91a5cffe
commit to get right release date 
Autobuilds use the date of last commit as the version,
so this will make version be 6.20180626.

(This is probably a misfeature of the build system.)
 2018-06-26 00:00:40 -04:00
Joey Hess
561e4531e5
announcing the security fix release 2018-06-25 22:14:32 -04:00
Joey Hess
dc6cb6aa5f
Merge branch 'later' 2018-06-25 21:59:20 -04:00
Joey Hess
3160cadba3 git-annex version 6.20180626 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEKKUAw1IH6rcvbA8l2xLbD/BfjzgFAlstCaQACgkQ2xLbD/Bf
 jzh5nxAAn7D9soTI0ex6AVDDo2CjOyTTDVrIcl2h5XizfuUD3ev5P0TR3BZmzpAb
 MI6uaZ8kxqZ/eGAsBTyH9PsV7QVYIdht9t89ytP4xWyTQiOgjyJeA6PnJl4zVK9z
 Y8Of3mlylaz+97+sndljpsvy/KHENrHI7HHd+qxAu7wKysJxG6fJB7CjremkjaCI
 zAwg3mIy72ZKyuR/8hL9puJN9fdfw1ulkzQR+he007e/HkurPCwgRAOYW/Aa2tpY
 Oigdb9a6/0nl/VnOS8ZyHrSPRrhLH9c4IBmsdC1Xt5NDVmID/sWgD9uPF9dsHSMF
 OM25QdSlJ5cSNg+/XCpmmhC9MjgKkuVNpZ/fWBaHFs6KYgGhtZcAayQdz5AmMS2N
 HTPWB1IxZiV5TQHQpLbdH/q3RfNtRq1G1tc24zpd/zdhzijeTM6D8n4No6LXNq8X
 7U0qcrp9TdLOpBCTf6Jrg/7qFaXddHoEW1e3KrsOmB0hlYHuNxfY4bs0+ROeXGOT
 00koezcbF8kEI0ekoDvJjtVqaUq+608YjJZ5v7dE0vbtTj0KGbl5EHwC9atUluCX
 MHyTDY89uq68g4HIDytL001ZLvE3EUGJc4jh3+OMDzuZSKB5uwJIIky+qIaQu34K
 QJrZuyAIY0sVFV6LUX9nwqTW6Nnx/bB+kZ6k0+gx+Lpf7pUpE+o=
 =kex4
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEKKUAw1IH6rcvbA8l2xLbD/BfjzgFAlsxnX4ACgkQ2xLbD/Bf
 jzjK1xAAnJ58ZxLyTYlCZRcKiR81UHS/Mk6+SDAjRIRbT0SsY+6gSP55XKjrcuOb
 Jatp+6cNNSgk2lBpn37mq+rYIqboFh9moDRK7JSh1mDHCVtIwdARGblFRfuwaWPi
 xHnu+Pj43+SP7OF+8qP8/kDM+js3iMS+0gvBBz8pQN/yJDROXii6u0eONOd7vbER
 iRY9QpJdj5lp3hjaWfXt5iJC0re0eOAY4eUSHPsFIASysShnn33dFPOZ2hbhRKjR
 unQHUVIUE+ehmW3w9qIqn+9v2kca7laGK11cvzYRpmu/9rrvpf+RF1h42S8822dP
 CKHvxDkBGbyqTA+F9/6zpU1i9/ARgHFDpScRcdq7ZJi9FbWabKDklHCsgxwrkdXb
 +FXgb7N5Sa4+eVDNUf4rxldtLPX53nrtZ3IqrGiCWApCvbysNyP5kE0nix02l9z2
 xzY2vlpicx7TOMoO9mZesSFNgRzuFAbbya/zDJrz+xfgSRYXRYg58yTpmhpTFvSI
 h3Fw6+MYvehvRdAweLtoQt2p/UV2MAWrTpNzFoqgf2OCQOiH97ACDHn8Yki9rnQi
 NuMsqv9WOYQs4SaygDZMKemgAxftf3uaXiBW0RzHHwwWnDjHhqsEioOvOhNNyZbz
 U3OjKrH1JZlkNHlIBQD4BsWGLlIct66ZTU3k2OxPEp+mpEG/Xi4=
 =p+cW
 -----END PGP SIGNATURE-----

Merge tag '6.20180626' - previously embargoed security release
 2018-06-25 21:56:43 -04:00
Joey Hess
74890e1457
set 6.20180626 as urgent upgrade 
This causes the webapp to tell the user's it's an urgent upgrade, which
this security fix is.
 2018-06-25 21:52:02 -04:00
Yaroslav Halchenko
fd725a0bb1
NF: a standalone-no-LOCPATH patch for the Debian standalone build 2018-06-25 13:54:14 -04:00
bqone@ea19c1433d6c23d05a56fe7b055d92010ab75ffb
89a2c1b220 Added a comment: Not working on OnePlus 6 2018-06-25 15:57:13 +00:00
Joey Hess
6091b7b9db
info: Display uuid and description when a repository is identified by uuid, and for "here". 2018-06-24 17:38:18 -04:00
Joey Hess
a5228ac765
Support configuring remote.web.annex-cost and remote.bittorrent.annex-cost 
Seems that has never worked before due to oversight.
 2018-06-24 17:31:22 -04:00
Joey Hess
57dc30a029
finalize release 2018-06-22 10:37:01 -04:00
Joey Hess
47cd6923b4
mention new limitation 2018-06-22 10:30:10 -04:00
Joey Hess
dab55715da
add link to advistory 2018-06-22 10:27:22 -04:00
Joey Hess
3976b89116
fix license date 
I wrote this this year
 2018-06-22 10:25:53 -04:00
yves.noirjean@3f9b06d19a920fbf5c82340c362e5971b00d4af2
5d8d4de172 Added a comment 2018-06-22 07:53:26 +00:00
Joey Hess
eb8a8976a9
comment 2018-06-21 20:54:02 -04:00
Joey Hess
9faef71650
add upgrade note 2018-06-21 18:16:44 -04:00
Joey Hess
fff1825f13
adjust version 2018-06-21 16:50:41 -04:00