← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/ssh/src/ssh_connection_manager.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ssh/src/ssh_connection_manager.erl
147
147
    try   call(ConnectionManager, {close, ChannelId}) of
148
148
          ok ->
149
149
            ok;
150
 
          {error,normal} ->
 
150
          {error, channel_closed} ->
151
151
            ok
152
152
    catch
153
153
        exit:{noproc, _} ->
158
158
    try call(ConnectionManager, stop) of
159
159
        ok ->
160
160
            ok;
161
 
        {error,normal} ->
 
161
        {error, channel_closed} ->
162
162
            ok
163
163
    catch
164
164
        exit:{noproc, _} ->
604
604
        exit:{timeout, _} ->
605
605
            {error, timeout};
606
606
        exit:{normal, _} ->
607
 
            {error, normal}
 
607
            {error, channel_closed}
608
608
    end.
609
609
 
610
610
cast(Pid, Msg) ->