diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-06 20:18:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-06 20:20:52 -0400 |
| commit | 466a2c31be0f662c3c93dd54867d2a969e01714e (patch) | |
| tree | 8ec40ec574bf752ce4fa79bc94f9ca805e594641 /debian | |
| parent | af8e2e2f1db15d6cd5951f8a5ba7eafda93df519 (diff) | |
bring back --quiet filtering of stdout and stderr, with deadlock fixed
I don't quite understand the cause of the deadlock. It only occurred
when git-annex-shell transferinfo was being spawned over ssh to feed
download transfer progress back. And if I removed this line from
feedprogressback, the deadlock didn't occur:
bytes <- readSV v
The problem was not a leaked FD, as far as I could see. So what was it?
I don't know.
Anyway, this is a nice clean implementation, that avoids the deadlock.
Just fork off the async threads to handle filtering the stdout and stderr,
and let them clean up their handles whenever they decide to exit.
I've verified that the handles do get promptly closed, although a little
later than I would expect. Presumably that "little later" is what
was making waiting on the threads deadlock.
Despite the late exit, the last line of stdout and stderr appears where
I'd want it to, so I guess this is ok..
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ada8b2321..c61222c62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-annex (5.20150406.2) UNRELEASED; urgency=medium + + * --quiet now suppresses progress displays from eg, rsync. + (Second time's the charm..) + + -- Joey Hess <id@joeyh.name> Mon, 06 Apr 2015 20:14:20 -0400 + git-annex (5.20150406.1) unstable; urgency=medium * Fixes a bug in the last release that caused rsync and possibly |