# # # patch "contrib/Monotone.pm" # from [9aeeb744962667a38d10430785f472275cba764f] # to [26de2e1c696575b72947ccffa6519caaea536627] # ============================================================ --- contrib/Monotone.pm 9aeeb744962667a38d10430785f472275cba764f +++ contrib/Monotone.pm 26de2e1c696575b72947ccffa6519caaea536627 @@ -24,13 +24,17 @@ sub open ($$) { sub open ($$) { my ( $self, $db, $workspace ) = @_; + local (*READ, *WRITE); if (defined($db) && defined($workspace)) { - local (*READ, *WRITE); $self->{PID} = open2(\*READ, \*WRITE, "mtn --db=$db --root=$workspace automate stdio" ); - $self->{In} = *READ; - $self->{Out} = *WRITE; - $self->{CmdNum} = 0; + } elsif (defined($workspace)) { + $self->{PID} = open2(\*READ, \*WRITE, "mtn --root=$workspace automate stdio" ); + } else { + $self->{PID} = open2(\*READ, \*WRITE, "mtn automate stdio" ); } + $self->{In} = *READ; + $self->{Out} = *WRITE; + $self->{CmdNum} = 0; } sub call {