Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2012-11-13 13:32:27 -04:00
commit c1b7731787
8 changed files with 129 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 3"
date="2012-11-13T17:11:51Z"
content="""
This has been previously reported: [[bugs/OSX_git-annex.app_error:__LSOpenURLsWithRole()]]
No clue what that error is supposed to mean.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 1"
date="2012-11-13T17:08:14Z"
content="""
You forgot to say how it fails.
"""]]

View file

@ -0,0 +1,62 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnldTTAP8PAifJUmqhRar6RAWNWlRcencw"
nickname="Marco"
subject="The failure"
date="2012-11-13T17:24:40Z"
content="""
Configuring certificate-1.2.2...
Building certificate-1.2.2...
Preprocessing library certificate-1.2.2...
[1 of 9] Compiling Data.Certificate.KeyRSA ( Data/Certificate/KeyRSA.hs, dist/build/Data/Certificate/KeyRSA.o )
Data/Certificate/KeyRSA.hs:29:27:
Constructor `RSA.PrivateKey' does not have field `RSA.private_size'
In the expression:
RSA.PrivateKey
{RSA.private_size = calculate_modulus p_modulus 1,
RSA.private_n = p_modulus, RSA.private_d = priv_exp,
RSA.private_p = p_p1, RSA.private_q = p_p2,
RSA.private_dP = p_exp1, RSA.private_dQ = p_exp2,
RSA.private_qinv = p_coef}
In an equation for `privkey':
privkey
= RSA.PrivateKey
{RSA.private_size = calculate_modulus p_modulus 1,
RSA.private_n = p_modulus, RSA.private_d = priv_exp,
RSA.private_p = p_p1, RSA.private_q = p_p2,
RSA.private_dP = p_exp1, RSA.private_dQ = p_exp2,
RSA.private_qinv = p_coef}
In an equation for `parsePrivate':
parsePrivate
[Start Sequence,
IntVal 0,
IntVal p_modulus,
IntVal pub_exp,
IntVal priv_exp,
IntVal p_p1,
IntVal p_p2,
IntVal p_exp1,
IntVal p_exp2,
IntVal p_coef,
End Sequence]
= Right (pubkey, privkey)
where
privkey
= RSA.PrivateKey
{RSA.private_size = calculate_modulus p_modulus 1,
RSA.private_n = p_modulus, RSA.private_d = priv_exp,
RSA.private_p = p_p1, RSA.private_q = p_p2,
RSA.private_dP = p_exp1, RSA.private_dQ = p_exp2,
RSA.private_qinv = p_coef}
pubkey
= RSA.PublicKey
{RSA.public_size = calculate_modulus p_modulus 1,
RSA.public_n = p_modulus, RSA.public_e = pub_exp}
calculate_modulus n i
= if (2 ^ (i * 8)) > n then i else calculate_modulus n (i + 1)
cabal: Error: some packages failed to install:
authenticate-1.3.2 depends on certificate-1.2.2 which failed to install.
certificate-1.2.2 failed during the building phase. The exception was:
ExitFailure 1
git-annex-3.20121112 depends on certificate-1.2.2 which failed to install.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 2"
date="2012-11-13T17:09:31Z"
content="""
It's not there yet. I don't think it will be hard to add, most of the same things need to be done to support upload progress bars with S3.
"""]]

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 2"
date="2012-11-13T17:27:31Z"
content="""
So, I don't know how to suppress this message without causing worse problems, like suppressing real error messages, and even password prompts.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 1"
date="2012-11-13T17:25:07Z"
content="""
Not without exposing the secret token to other users in the system by passing it as a parameter to the browser command. Which is why it uses the method it does.
But, you can configure it to use a specific browser in the standard git way:
git config web.browser chromium
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 2"
date="2012-11-13T17:21:35Z"
content="""
@Karsten that seems likely.
I've made a change so it shows the error message from the XMPP library I'm using. Which may or may not be useful..
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 1"
date="2012-11-13T17:30:31Z"
content="""
git-annex commands only operate on files in the currently checked out working copy. You can send files to/from bare repos from non-bare repos. But you cannot do anything with them inside the bare repo, just as regular git doesn't let you commit inside a bare repo.
There is talk about [[todo/add_-all_option]], which would be usable in bare repos.
"""]]