amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-06-30 16:53:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ccon and ctel not working correctly

Browse source 
Prevent ssh options being applied on non-ssh connections.  Github issue #35
This commit is contained in:
Duncan Ferguson 2015-09-21 22:19:22 +01:00
parent 5fad534ef0
commit 153709b220
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Changes
View file

@ -3,6 +3,7 @@
- Allow re-adding closed session (Github issue #27 - thanks to Andrew Stevenson)
- Allow sorting windows in natural order (Github issue #28 - thanks to Andrew Stevenson)
- Fix links in metadata files to trackers (Github issue #41)
- Fix ctel and ccon not working correctly (Github issue #35)
4.03_06 2015-01-31 Duncan Ferguson <duncan_ferguson@user.sf.net>
- Remove references to 'logmsg' preventing the history window from working (thanks to Andrew Stevenson)

23
lib/App/ClusterSSH.pm
View file

@ -1975,16 +1975,19 @@ sub run {
# only use ssh_args from options if config file ssh_args not set AND
# options is not the default value otherwise the default options
# value is used instead of the config file
if ( $self->config->{ssh_args} ) {
if ( $self->options->options
&& $self->options->options ne $self->options->options_default )
{
$self->config->{ssh_args} = $self->options->options;
if ( $self->config->{comms} eq 'ssh' ) {
if ( $self->config->{ssh_args} ) {
if ( $self->options->options
&& $self->options->options ne
$self->options->options_default )
{
$self->config->{ssh_args} = $self->options->options;
}
}
else {
$self->config->{ssh_args} = $self->options->options
if ( $self->options->options );
}
}
else {
$self->config->{ssh_args} = $self->options->options
if ( $self->options->options );
}
$self->config->{terminal_args} = $self->options->term_args
@ -2195,6 +2198,8 @@ the code until this time.
=item populate_send_menu_entries_from_xml
=item re_add_closed_sessions
=item remove_repeated_servers
=item resolve_names