Author: pebender
Date: Wed Mar 4 17:37:18 2009
New Revision: 4446
Modified:
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Made further fixes related to shutting down mythfrontend.
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Wed Mar 4
17:37:18 2009
@@ -1 +1 @@
-91a03f60b927c0b3667df46622634332 download/MiniMyth.pm
+130ccd0465e915280c2d1eb862c7b627 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Wed Mar
4 17:37:18 2009
@@ -1018,6 +1018,8 @@
my $self = shift;
my $command = shift;
+ my @lines = ();
+
my $port = $self->mythdb_settings_get('NetworkControlPort');
my $prompt = '/\# $/';
@@ -1029,12 +1031,13 @@
if (($telnet) && ($telnet->open()))
{
$telnet->waitfor($prompt);
- my @lines = $telnet->cmd($command);
+ @lines = $telnet->cmd($command);
$telnet->cmd('exit');
$telnet->close;
chomp @lines;
- return \...@lines;
}
+
+ return \...@lines;
}
#===============================================================================
@@ -2144,7 +2147,8 @@
{
for (my $timeout = 10 ; $timeout > 0 ; $timeout--)
{
- if ($self->mythfrontend_networkcontrol('query
location')->[0] eq 'MainMenu')
+ my $mythfrontend_location = join("\n",
@{$self->mythfrontend_networkcontrol('query location')});
+ if ($mythfrontend_location eq 'MainMenu')
{
last;
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
