Bug#574512: [Monotone-debian] Bug#574512: monotone: mtn sync fails with 'fatal' error message

[Timothy Brownawell]

Thomas Keller wrote:
> #
> # old_revision [dda54058811fd39356e8755ad0d68998a5159dd3]
> #
> # patch "network/reactor.cc"
> #  from [a90cee5442d3c77d8082d7bb91d4d23170bf25fb]
> #    to [4f424db0f326e61b015ff042880f2d77589c6429]
> #
> ============================================================
> --- network/reactor.cc  a90cee5442d3c77d8082d7bb91d4d23170bf25fb
> +++ network/reactor.cc  4f424db0f326e61b015ff042880f2d77589c6429
> @@ -87,8 +87,9 @@ void reactor::remove(shared_ptr<reactabl
>    if (i != items.end())
>      {
>        items.erase(i);
> +      bool had_pipe = have_pipe;
>        have_pipe = false;
> -      if (readying)
> +      if (readying && !had_pipe)
>          item->remove_from_probe(probe);
>      }
>  }
>
> @Timothy: I was a bit careful about setting have_pipe after `if
> (readying) ...` here - if you think this would not introduce a problem,
> then this patch could be simplyfied of course.

The simpler way should be fine, neither version of remove_from_probe 
cares about the reactor's internal state.