Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
commit
4d49953b76
3 changed files with 108 additions and 0 deletions
62
doc/bugs/7.20181105+git172-g76fc9af4_not_buildable.mdwn
Normal file
62
doc/bugs/7.20181105+git172-g76fc9af4_not_buildable.mdwn
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
first ran into on my laptop and just thought that my setup is outdated... this is now in clean uptodate debian sid
|
||||||
|
|
||||||
|
[[!format sh """
|
||||||
|
Annex/Ssh.hs:207:25: error:
|
||||||
|
* Couldn't match type `IO' with `Annex'
|
||||||
|
Expected type: Annex ()
|
||||||
|
Actual type: IO ()
|
||||||
|
* In the second argument of `($)', namely
|
||||||
|
`unlessM (tryssh ["-o", "BatchMode=true"])
|
||||||
|
$ do liftIO $ print "ok then"
|
||||||
|
let p = ... in p `concurrently` p'
|
||||||
|
In the second argument of `($)', namely
|
||||||
|
`whenM (isNothing <$> fromLockCache socketlock)
|
||||||
|
$ unlessM (tryssh ["-o", "BatchMode=true"])
|
||||||
|
$ do liftIO $ print "ok then"
|
||||||
|
let p = ... in p `concurrently` p'
|
||||||
|
In the expression:
|
||||||
|
debugLocks
|
||||||
|
$ whenM (isNothing <$> fromLockCache socketlock)
|
||||||
|
$ unlessM (tryssh ["-o", "BatchMode=true"])
|
||||||
|
$ do liftIO $ print "ok then"
|
||||||
|
let p = ... in p `concurrently` p
|
||||||
|
|
|
||||||
|
207 | unlessM (tryssh ["-o", "BatchMode=true"]) $ do
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...
|
||||||
|
|
||||||
|
Annex/Ssh.hs:213:70: error:
|
||||||
|
* Couldn't match expected type `IO a0' with actual type `Annex ()'
|
||||||
|
* In the first argument of `concurrently', namely `p'
|
||||||
|
In the expression: p `concurrently` p
|
||||||
|
In a stmt of a 'do' block:
|
||||||
|
let p = void $ prompt $ tryssh [] in p `concurrently` p
|
||||||
|
|
|
||||||
|
213 | let p = void $ prompt $ tryssh [] in p `concurrently` p
|
||||||
|
| ^
|
||||||
|
|
||||||
|
Annex/Ssh.hs:213:70: error:
|
||||||
|
* Couldn't match type `(a0, b0)' with `()'
|
||||||
|
Expected type: IO ()
|
||||||
|
Actual type: IO (a0, b0)
|
||||||
|
* In the expression: p `concurrently` p
|
||||||
|
In a stmt of a 'do' block:
|
||||||
|
let p = void $ prompt $ tryssh [] in p `concurrently` p
|
||||||
|
In the second argument of `($)', namely
|
||||||
|
`do liftIO $ print "ok then"
|
||||||
|
let p = ... in p `concurrently` p'
|
||||||
|
|
|
||||||
|
213 | let p = void $ prompt $ tryssh [] in p `concurrently` p
|
||||||
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
Annex/Ssh.hs:213:87: error:
|
||||||
|
* Couldn't match expected type `IO b0' with actual type `Annex ()'
|
||||||
|
* In the second argument of `concurrently', namely `p'
|
||||||
|
In the expression: p `concurrently` p
|
||||||
|
In a stmt of a 'do' block:
|
||||||
|
let p = void $ prompt $ tryssh [] in p `concurrently` p
|
||||||
|
|
|
||||||
|
213 | let p = void $ prompt $ tryssh [] in p `concurrently` p
|
||||||
|
| ^
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="yarikoptic"
|
||||||
|
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
|
||||||
|
subject="comment 36"
|
||||||
|
date="2018-11-19T22:46:01Z"
|
||||||
|
content="""
|
||||||
|
> Bisecting git-annex couldn't isolate the problem to any commit if the bug was fixed in concurrent-output. What commit did bisect point to?
|
||||||
|
|
||||||
|
[[!format sh \"\"\"
|
||||||
|
|
||||||
|
[yhalchen@discovery7 git-annex]$ git bisect start 900bf3436 05bfce7ca^
|
||||||
|
Already on 'master'
|
||||||
|
Your branch is up to date with 'origin/master'.
|
||||||
|
Bisecting: 7 revisions left to test after this (roughly 3 steps)
|
||||||
|
[04b5ed09d8bcd9cef83e605d5cc061892010ada7] close old unreproducible bug report
|
||||||
|
[yhalchen@discovery7 git-annex]$ git bisect run bash -c '! ../bisect-git-annex ../git-annex-dev.img ../bisect-git-annex-lock.sh'
|
||||||
|
running bash -c ! ../bisect-git-annex ../git-annex-dev.img ../bisect-git-annex-lock.sh
|
||||||
|
I: cleaning /ihome/yhalchen/git-annex
|
||||||
|
I: building 7.20181105-119-g04b5ed09d
|
||||||
|
...
|
||||||
|
872af2b2f1049e4eecf274ac70caf99a367f3818 is the first bad commit
|
||||||
|
commit 872af2b2f1049e4eecf274ac70caf99a367f3818
|
||||||
|
Author: Joey Hess <joeyh@joeyh.name>
|
||||||
|
Date: Thu Nov 15 14:26:40 2018 -0400
|
||||||
|
|
||||||
|
avoid using concurrent-output at all when --quiet or --json
|
||||||
|
|
||||||
|
Of course, it wasn't used much in those modes, because normal output is
|
||||||
|
avoided. But it was still initialized and used in a few places,
|
||||||
|
including a call to hideRegionsWhile.
|
||||||
|
|
||||||
|
:040000 040000 b81c7bae30915cdacf1fbfd11b0c203c59381ea1 5eff43f94de79fd18b6480a6ace8e3115533ca07 M CmdLine
|
||||||
|
:100644 100644 9e33bd7762e0488ab2d4d371ca40ee4f70a0bdd8 21422e4495ef77cadbfa8ba48e832b300a656839 M Messages.hs
|
||||||
|
:040000 040000 9d7b1b176904f78b29ffe92939411e2f42b0d770 fc3c3a51b5bdfab4c12198490825e801e7f08ac4 M Messages
|
||||||
|
bisect run success
|
||||||
|
\"\"\"]]
|
||||||
|
"""]]
|
|
@ -0,0 +1,9 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="marvin@3296bf3c446430c3b2ebc32b5c784ee976620847"
|
||||||
|
nickname="marvin"
|
||||||
|
avatar="http://cdn.libravatar.org/avatar/a07e2adf7ff40bdd4c3fe20ededc0a4e"
|
||||||
|
subject="comment 11"
|
||||||
|
date="2018-11-20T11:06:31Z"
|
||||||
|
content="""
|
||||||
|
yes. assistant runs ob both and gets autostarted. i dont have a other box to try it out. but slowly im giving up on using the assistant.
|
||||||
|
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue