Author: pebender
Date: Sat Jan 3 17:23:39 2009
New Revision: 4164
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/audio.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_DHCP.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTERNAL.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/cpu.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/dhcp.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/flash.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lcdproc.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/media.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/modules_manual.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/time.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Cleaned up 'error:' and 'warning:' prefixes in error messages for perl
init scripts.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Jan 3
17:23:39 2009
@@ -12,9 +12,11 @@
MythTV 0.21: version 0.21.0, release-0-21-fixes branch
svn 19540.
MythTV trunk: version trunk.19538 trunk svn 19538.
-Obsoleted sh init scripts
+Obsoleted init scripts
- Obsoleted sh init scripts. MM_INIT_TYPE=sh will no longer work.
- Improved perl init script error messages, including minimyth.pm.
+ - Cleaned up 'error:' and 'warning:' prefixes in error messages for
perl
+ init scripts.
Modified MiniMyth configuration
- Obsoleted MM_WIIMOTE_ENABLED.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/audio.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/audio.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/audio.pm
Sat Jan 3 17:23:39 2009
@@ -41,7 +41,7 @@
}
if (system(qq($amixer_command > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('err', "error: the audio driver does not
appear to be loaded.");
+ $minimyth->message_output('err', "the audio driver does not appear
to be loaded.");
return 0;
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
Sat Jan 3 17:23:39 2009
@@ -24,7 +24,7 @@
}
else
{
-
$minimyth->message_output('err', "error: '/usr/bin/mythbackend' not
found.");
+ $minimyth->message_output('err', "'/usr/bin/mythbackend' not
found.");
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
Sat Jan 3 17:23:39 2009
@@ -47,12 +47,12 @@
# Make sure that there is a MiniMyth configuration file.
if (! -e '/etc/minimyth.d/minimyth.conf')
{
- $minimyth->message_output('err', "error: 'minimyth.conf' not
found.");
+ $minimyth->message_output('err', "'minimyth.conf' not found.");
return 0;
}
if (! -r '/etc/minimyth.d/minimyth.conf')
{
- $minimyth->message_output('err', "error: 'minimyth.conf' not
readable.");
+ $minimyth->message_output('err', "'minimyth.conf' not readable.");
return 0;
}
@@ -75,7 +75,7 @@
chomp;
if ($minimyth->var_exists($_))
{
- $minimyth->message_output('err', "error: 'minimyth.conf'
is out of date. '$_' is obsolete.");
+ $minimyth->message_output('err', "'minimyth.conf' is out
of date. '$_' is obsolete.");
}
}
close(FILE);
@@ -90,7 +90,7 @@
$minimyth->confro_get('/minimyth.pm', '/etc/minimyth.d/minimyth.pm');
if (! -e '/etc/minimyth.d/minimyth.pm')
{
- $minimyth->message_output('err', "error: failed to
fetch 'minimyth.pm' file.");
+ $minimyth->message_output('err', "failed to
fetch 'minimyth.pm' file.");
}
}
if (-f '/etc/minimyth.d/minimyth.pm')
@@ -157,7 +157,7 @@
close(FILE);
if ($conf_error != 0)
{
- $minimyth->message_output('err', "error:
check '/var/log/minimyth.err.log' for further details.");
+
$minimyth->message_output('err', "check '/var/log/minimyth.err.log' for
further details.");
return 0;
}
}
@@ -337,7 +337,7 @@
}
if ($valid == 0)
{
- $minimyth->message_output('err', qq(error: $var_name=') .
$minimyth->var_get($var_name) . qq(' is not valid.));
+ $minimyth->message_output('err', qq($var_name=') .
$minimyth->var_get($var_name) . qq(' is not valid.));
# Replace the invalid value with the default value,
# so that dependent variables will get a valid value.
@@ -382,7 +382,7 @@
}
if ($obsolete == 1)
{
- $minimyth->message_output('err', qq(error: 'minimyth.conf' is
out of date. $var_name=') . $minimyth->var_get($var_name) . qq(' is
obsolete.));
+ $minimyth->message_output('err', qq('minimyth.conf' is out of
date. $var_name=') . $minimyth->var_get($var_name) . qq(' is obsolete.));
}
}
@@ -438,7 +438,7 @@
my $result = $minimyth->confro_get($name_remote,
$name_local);
if (! -e $name_local)
{
- $minimyth->message_log('err', qq(error: failed to
fetch MiniMyth read-only configuration file ') . $name_remote . qq('));
+ $minimyth->message_log('err', qq(failed to fetch
MiniMyth read-only configuration file ') . $name_remote . qq('));
}
else
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_DHCP.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_DHCP.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_DHCP.pm
Sat Jan 3 17:23:39 2009
@@ -27,7 +27,7 @@
my $hostname = $minimyth->hostname();
if (! $hostname)
{
- $minimyth->message_output('err', qq(error: 'Host Name'
(or 'MM_DHCP_HOST_NAME') not configured.));
+ $minimyth->message_output('err', qq('Host Name'
(or 'MM_DHCP_HOST_NAME') not configured.));
}
}
}
@@ -47,7 +47,7 @@
{
if (! -e '/etc/localtime')
{
- $minimyth->message_output('err', qq(error: 'TCode'
(or 'MM_DHCP_TCODE') not configured.));
+ $minimyth->message_output('err', qq('TCode'
(or 'MM_DHCP_TCODE') not configured.));
}
}
}
@@ -74,7 +74,7 @@
}
if ($valid == 0)
{
- $minimyth->message_output('err', qq(error: 'Domain Name
Servers' (or 'MM_DHCP_DOMAIN_NAME_SERVERS') not configured.));
+ $minimyth->message_output('err', qq('Domain Name Servers'
(or 'MM_DHCP_DOMAIN_NAME_SERVERS') not configured.));
}
}
}
@@ -101,7 +101,7 @@
}
if ($valid == 0)
{
- $minimyth->message_output('err', qq(error: 'NTP Servers'
(or 'MM_DHCP_NTP_SERVERS') not configured.));
+ $minimyth->message_output('err', qq('NTP Servers'
(or 'MM_DHCP_NTP_SERVERS') not configured.));
}
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTERNAL.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTERNAL.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTERNAL.pm
Sat Jan 3 17:23:39 2009
@@ -32,11 +32,11 @@
if (( $minimyth->var_get('MM_EXTERNAL_VOLUME_UP')) && (!
$minimyth->var_get('MM_EXTERNAL_VOLUME_DOWN')))
{
- $minimyth->message_output('err', "error: MM_EXTERNAL_VOLUME_UP
is set but MM_EXTERNAL_VOLUME_DOWN is not set.");
+ $minimyth->message_output('err', "MM_EXTERNAL_VOLUME_UP is set
but MM_EXTERNAL_VOLUME_DOWN is not set.");
}
if ((! $minimyth->var_get('MM_EXTERNAL_VOLUME_UP')) && (
$minimyth->var_get('MM_EXTERNAL_VOLUME_DOWN')))
{
- $minimyth->message_output('err', "error: MM_EXTERNAL_VOLUME_UP
is not set but MM_EXTERNAL_VOLUME_DOWN is set.");
+ $minimyth->message_output('err', "MM_EXTERNAL_VOLUME_UP is not
set but MM_EXTERNAL_VOLUME_DOWN is set.");
}
}
};
@@ -49,19 +49,19 @@
if (( $minimyth->var_get('MM_EXTERNAL_VOLUME_MUTE')) && (!
$minimyth->var_get('MM_EXTERNAL_VOLUME_DOWN')))
{
- $minimyth->message_output('err', "error:
MM_EXTERNAL_VOLUME_MUTE is set but MM_EXTERNAL_VOLUME_DOWN is not set.");
+ $minimyth->message_output('err', "MM_EXTERNAL_VOLUME_MUTE is
set but MM_EXTERNAL_VOLUME_DOWN is not set.");
}
if (( $minimyth->var_get('MM_EXTERNAL_VOLUME_MUTE')) && (!
$minimyth->var_get('MM_EXTERNAL_VOLUME_UP' )))
{
- $minimyth->message_output('err', "error:
MM_EXTERNAL_VOLUME_MUTE is set but MM_EXTERNAL_VOLUME_UP is not set.");
+ $minimyth->message_output('err', "MM_EXTERNAL_VOLUME_MUTE is
set but MM_EXTERNAL_VOLUME_UP is not set.");
}
if ((! $minimyth->var_get('MM_EXTERNAL_VOLUME_MUTE')) && (
$minimyth->var_get('MM_EXTERNAL_VOLUME_DOWN')))
{
- $minimyth->message_output('err', "error:
MM_EXTERNAL_VOLUME_MUTE is not set but MM_EXTERNAL_VOLUME_DOWN is set.");
+ $minimyth->message_output('err', "MM_EXTERNAL_VOLUME_MUTE is
not set but MM_EXTERNAL_VOLUME_DOWN is set.");
}
if ((! $minimyth->var_get('MM_EXTERNAL_VOLUME_MUTE')) && (
$minimyth->var_get('MM_EXTERNAL_VOLUME_UP' )))
{
- $minimyth->message_output('err', "error:
MM_EXTERNAL_VOLUME_MUTE is not set but MM_EXTERNAL_VOLUME_UP is set.");
+ $minimyth->message_output('err', "MM_EXTERNAL_VOLUME_MUTE is
not set but MM_EXTERNAL_VOLUME_UP is set.");
}
}
};
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
Sat Jan 3 17:23:39 2009
@@ -36,7 +36,7 @@
if ($minimyth->var_get($name) eq 'G.A.N.T.')
{
- $minimyth->message_output('err', "error: theme 'G.A.N.T.' has
been renamed to 'G.A.N.T'. Please update '$name'.");
+ $minimyth->message_output('err', "theme 'G.A.N.T.' has been
renamed to 'G.A.N.T'. Please update '$name'.");
}
}
};
@@ -54,7 +54,7 @@
my $theme_name = $minimyth->var_get('MM_THEME_NAME');
if (-e "/usr/share/mythtv/themes/$theme_name")
{
- $minimyth->message_output('err', "error: MythTV theme
directory '$theme_name' already exists.");
+ $minimyth->message_output('err', "MythTV theme
directory '$theme_name' already exists.");
return '';
}
}
@@ -63,7 +63,7 @@
my $theme_name = $minimyth->var_get('MM_THEME_NAME');
if (! -e "/usr/share/mythtv/themes/$theme_name")
{
- $minimyth->message_output('err', "error: MythTV theme
directory '$theme_name' does not exist.");
+ $minimyth->message_output('err', "MythTV theme
directory '$theme_name' does not exist.");
return '';
}
}
@@ -105,7 +105,7 @@
my $themeosd_name = $minimyth->var_get('MM_THEMEOSD_NAME');
if (-e "/usr/share/mythtv/themes/$themeosd_name")
{
- $minimyth->message_output('err', "error: MythTV theme
directory '$themeosd_name' already exists.");
+ $minimyth->message_output('err', "MythTV theme
directory '$themeosd_name' already exists.");
return '';
}
}
@@ -114,7 +114,7 @@
my $themeosd_name = $minimyth->var_get('MM_THEMEOSD_NAME');
if (! -e "/usr/share/mythtv/themes/$themeosd_name")
{
- $minimyth->message_output('err', "error: MythTV theme
directory '$themeosd_name' does not exist.");
+ $minimyth->message_output('err', "MythTV theme
directory '$themeosd_name' does not exist.");
return '';
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
Sat Jan 3 17:23:39 2009
@@ -134,7 +134,7 @@
($minimyth->var_get('MM_X_OUTPUT_VGA') eq 'none') &&
($minimyth->var_get('MM_X_OUTPUT_TV') eq 'none'))
{
- $minimyth->message_output('err',
qq(error: 'MM_X_OUTPUT_DVI', 'MM_X_OUTPUT_VGA' and 'MM_X_OUTPUT_TV' are all
disabled.));
+ $minimyth->message_output('err',
qq('MM_X_OUTPUT_DVI', 'MM_X_OUTPUT_VGA' and 'MM_X_OUTPUT_TV' are all
disabled.));
}
if ($minimyth->var_get('MM_X_DRIVER') eq 'nvidia')
{
@@ -142,17 +142,17 @@
if ((! $minimyth->var_get('MM_X_OUTPUT_DVI') eq 'none') &&
(! $minimyth->var_get('MM_X_OUTPUT_VGA') eq 'none'))
{
- $minimyth->message_output('err',
qq(error: 'MM_X_OUTPUT_DVI' and 'MM_X_OUTPUT_VGA' are both enabled.));
+ $minimyth->message_output('err', qq('MM_X_OUTPUT_DVI'
and 'MM_X_OUTPUT_VGA' are both enabled.));
}
if ((! $minimyth->var_get('MM_X_OUTPUT_DVI') eq 'none') &&
(! $minimyth->var_get('MM_X_OUTPUT_TV') eq 'none'))
{
- $minimyth->message_output('err',
qq(error: 'MM_X_OUTPUT_DVI' and 'MM_X_OUTPUT_TV' are both enabled.));
+ $minimyth->message_output('err', qq('MM_X_OUTPUT_DVI'
and 'MM_X_OUTPUT_TV' are both enabled.));
}
if ((! $minimyth->var_get('MM_X_OUTPUT_VGA') eq 'none') &&
(! $minimyth->var_get('MM_X_OUTPUT_TV') eq 'none'))
{
- $minimyth->message_output('err',
qq(error: 'MM_X_OUTPUT_VGA' and 'MM_X_OUTPUT_TV' are both enabled.));
+ $minimyth->message_output('err', qq('MM_X_OUTPUT_VGA'
and 'MM_X_OUTPUT_TV' are both enabled.));
}
}
if ($minimyth->var_get('MM_X_DRIVER') eq 'openchrome')
@@ -161,7 +161,7 @@
if ((! $minimyth->var_get('MM_X_OUTPUT_DVI') eq 'none') &&
(! $minimyth->var_get('MM_X_OUTPUT_TV') eq 'none'))
{
- $minimyth->message_output('err',
qq(error: 'MM_X_OUTPUT_DVI' and 'MM_X_OUTPUT_TV' are both enabled.));
+ $minimyth->message_output('err', qq('MM_X_OUTPUT_DVI'
and 'MM_X_OUTPUT_TV' are both enabled.));
}
}
}
@@ -637,7 +637,7 @@
if (($minimyth->var_get('MM_X_MODE_0') ne '') &&
($minimyth->var_get('MM_X_MODELINE_0') ne ''))
{
- $minimyth->message_output('err', qq(error: both 'MM_X_MODE_0'
and 'MM_X_MODELINE_0' cannot be set.));
+ $minimyth->message_output('err', qq(both 'MM_X_MODE_0'
and 'MM_X_MODELINE_0' cannot be set.));
}
}
};
@@ -704,7 +704,7 @@
if (($minimyth->var_get('MM_X_MODE_1') ne '') &&
($minimyth->var_get('MM_X_MODELINE_1') ne ''))
{
- $minimyth->message_output('err', qq(error: both 'MM_X_MODE_2'
and 'MM_X_MODELINE_2' cannot be set.));
+ $minimyth->message_output('err', qq(both 'MM_X_MODE_2'
and 'MM_X_MODELINE_2' cannot be set.));
}
}
};
@@ -771,7 +771,7 @@
if (($minimyth->var_get('MM_X_MODE_2') ne '') &&
($minimyth->var_get('MM_X_MODELINE_2') ne ''))
{
- $minimyth->message_output('err', qq(error: both 'MM_X_MODE_2'
and 'MM_X_MODELINE_2' cannot be set.));
+ $minimyth->message_output('err', qq(both 'MM_X_MODE_2'
and 'MM_X_MODELINE_2' cannot be set.));
}
}
};
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/cpu.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/cpu.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/cpu.pm
Sat Jan 3 17:23:39 2009
@@ -23,30 +23,30 @@
if (! -e '/etc/firmware/microcode.dat')
{
-
$minimyth->message_output('err', "error: '/etc/firmware/microcode.dat' does
not exist.");
+
$minimyth->message_output('err', "'/etc/firmware/microcode.dat' does not
exist.");
return 0;
}
my $kernel_module = 'microcode';
if (system(qq(/sbin/modprobe $kernel_module > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('err', "error: failed to load kernel
module: $kernel_module");
+ $minimyth->message_output('err', "failed to load kernel
module: $kernel_module");
return 0;
}
system(qq(/sbin/udevadm settle --timeout=60));
if (! -e '/dev/cpu/microcode')
{
- $minimyth->message_output('err', "error: '/dev/cpu/microcode'
does not exist.");
+ $minimyth->message_output('err', "'/dev/cpu/microcode' does
not exist.");
return 0;
}
if (! -e '/usr/sbin/microcode_ctl')
{
-
$minimyth->message_output('err', "error: '/usr/sbin/microcode_ctl' does not
exist.");
+ $minimyth->message_output('err', "'/usr/sbin/microcode_ctl'
does not exist.");
return 0;
}
if (system(qq(/usr/sbin/microcode_ctl -Q -f
/etc/firmware/microcode.dat > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('err', "error: failed to load CPU
microcode.");
+ $minimyth->message_output('err', "failed to load CPU
microcode.");
return 0;
}
system(qq(/sbin/modprobe -r $kernel_module));
@@ -99,7 +99,7 @@
my $kernel_module = 'cpufreq-' .
$minimyth->var_get('MM_CPU_FREQUENCY_GOVERNOR');
if (system(qq(/sbin/modprobe $kernel_module > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('err', "error: failed to load kernel
module: $kernel_module");
+ $minimyth->message_output('err', "failed to load kernel
module: $kernel_module");
return 0;
}
# Wait for everything to settle.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/dhcp.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/dhcp.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/dhcp.pm
Sat Jan 3 17:23:39 2009
@@ -85,7 +85,7 @@
# Start DHCP client on the interface.
if (system($command) != 0)
{
- $minimyth->message_output('err', "error: DHCP on
interface '$interface' failed.");
+ $minimyth->message_output('err', "DHCP on
interface '$interface' failed.");
return 0;
}
@@ -103,7 +103,7 @@
}
if (! $ip_address)
{
- $self->message_output('err', "error: DHCP on
interface '$interface' failed.");
+ $self->message_output('err', "DHCP on interface '$interface'
failed.");
return 0;
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/flash.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/flash.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/flash.pm
Sat Jan 3 17:23:39 2009
@@ -25,12 +25,12 @@
{
if (system(qq(/lib/ld-linux.so.2 --list
/usr/lib/browser/plugins/libflashplayer.so > /dev/null 2>&1)) != 0)
{
- $minimyth->message_output('err', 'error: Adobe Flash
Player will fail because libraries are missing.')
+ $minimyth->message_output('err', 'Adobe Flash Player
will fail because libraries are missing.')
}
}
if (-e '/lib/ld-linux-x86-64.so.2')
{
- $minimyth->message_output('err', 'error: Adobe Flash
Player will fail because it is a 32-bit library.');
+ $minimyth->message_output('err', 'Adobe Flash Player will
fail because it is a 32-bit library.');
}
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
Sat Jan 3 17:23:39 2009
@@ -22,7 +22,7 @@
my $kernel_module = 'uinput';
if (system(qq(/sbin/modprobe $kernel_module > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('err', "error: failed to load kernel
module: $kernel_module");
+ $minimyth->message_output('err', "failed to load kernel
module: $kernel_module");
return 0;
}
# The g15daemon daemon does not create it configuration file, so
init
@@ -36,7 +36,7 @@
}
if (! -e '/etc/g15daemon.conf')
{
- $minimyth->message_output('err', "error: failed to create
file '/etc/g15daemon.conf'.");
+ $minimyth->message_output('err', "failed to create
file '/etc/g15daemon.conf'.");
return 0;
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lcdproc.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lcdproc.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lcdproc.pm
Sat Jan 3 17:23:39 2009
@@ -37,7 +37,7 @@
}
if (! -e $device)
{
- $minimyth->message_output('err', "error: timed out waiting
for LCD/VFD device.");
+ $minimyth->message_output('err', "timed out waiting for
LCD/VFD device.");
return 0;
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Sat Jan 3 17:23:39 2009
@@ -157,7 +157,7 @@
}
if (! -e $device)
{
- $minimyth->message_output('err', "error: timed out waiting for
remote control device.");
+ $minimyth->message_output('err', "timed out waiting for remote
control device.");
return 0;
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
Sat Jan 3 17:23:39 2009
@@ -150,7 +150,7 @@
# Test Myth database connection.
if (! $minimyth->mythdb_x_test())
{
- $minimyth->message_output('err', "error: cannot connect to the
MythTV master backend database.");
+ $minimyth->message_output('err', "cannot connect to the MythTV
master backend database.");
return 0;
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/media.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/media.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/media.pm
Sat Jan 3 17:23:39 2009
@@ -35,13 +35,13 @@
close(FILE);
if ($mounted == 0)
{
- $minimyth->message_output('err', "error: '$mountpoint'
failed to mount.");
+ $minimyth->message_output('err', "'$mountpoint' failed
to mount.");
return 0;
}
}
if (system(qq(/bin/su -c '/usr/bin/test ! -r $mountpoint' -
minimyth)) == 0)
{
- $minimyth->message_output('err', "error: '$mountpoint' is
not readable by user 'minimyth'.");
+ $minimyth->message_output('err', "'$mountpoint' is not
readable by user 'minimyth'.");
return 0;
}
if ($mountpoint_name eq 'MM_MEDIA_TV_MOUNTPOINT')
@@ -50,7 +50,7 @@
{
if (system(qq(/bin/su -c '/usr/bin/test ! -w
$mountpoint' - minimyth)) == 0)
{
-
$minimyth->message_output('err', "error: '$mountpoint' is not writable by
user 'minimyth'.");
+ $minimyth->message_output('err', "'$mountpoint' is
not writable by user 'minimyth'.");
return 0;
}
}
@@ -59,7 +59,7 @@
{
if (system(qq(/bin/su -c '/usr/bin/test ! -w $mountpoint'
- minimyth)) == 0)
{
- $minimyth->message_output('err', "error: '$mountpoint'
is not writable by user 'minimyth'.");
+ $minimyth->message_output('err', "'$mountpoint' is not
writable by user 'minimyth'.");
return 0;
}
}
@@ -85,13 +85,13 @@
close(FILE);
if ($mounted == 0)
{
- $minimyth->message_output('err', "error: '$mountpoint'
failed to mount.");
+ $minimyth->message_output('err', "'$mountpoint' failed
to mount.");
return 0;
}
}
if (system(qq(/bin/su -c '/usr/bin/test ! -r $mountpoint' -
minimyth)) == 0)
{
- $minimyth->message_output('err', "error: '$mountpoint' is
not readable by user 'minimyth'.");
+ $minimyth->message_output('err', "'$mountpoint' is not
readable by user 'minimyth'.");
return 0;
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/modules_manual.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/modules_manual.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/modules_manual.pm
Sat Jan 3 17:23:39 2009
@@ -25,7 +25,7 @@
{
if (system(qq(/sbin/modprobe $kernel_module > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('warn', "warning: failed to load
kernel module: $kernel_module");
+ $minimyth->message_output('warn', "failed to load kernel
module: $kernel_module");
}
}
@@ -35,7 +35,7 @@
my $kernel_module = 'snd-pcm-oss';
if (system(qq(/sbin/modprobe $kernel_module > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('warn', "warning: failed to load
kernel module: $kernel_module");
+ $minimyth->message_output('warn', "failed to load kernel
module: $kernel_module");
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
Sat Jan 3 17:23:39 2009
@@ -57,7 +57,7 @@
{
if (!
$minimyth->url_mount($theme_url, "/usr/share/mythtv/themes/$theme_name"))
{
- $minimyth->message_output('err', "error: mount
of 'MM_THEME_URL=$theme_url' failed.");
+ $minimyth->message_output('err', "mount
of 'MM_THEME_URL=$theme_url' failed.");
return 0;
}
}
@@ -74,7 +74,7 @@
{
if (!
$minimyth->url_mount($themeosd_url, "/usr/share/mythtv/themes/$themeosd_name"))
{
- $minimyth->message_output('err', "error: mount
of 'MM_THEMEOSD_URL=$themeosd_url' failed.");
+ $minimyth->message_output('err', "mount
of 'MM_THEMEOSD_URL=$themeosd_url' failed.");
return 0;
}
}
@@ -97,38 +97,38 @@
my $transcode = $minimyth->application_path('transcode');
if (! $mtd)
{
- $minimyth->message_output('err', "error: 'mtd' not found.");
+ $minimyth->message_output('err', "'mtd' not found.");
return 0;
}
if (system(qq(/bin/su -c '/usr/bin/test ! -e $dvd_rip_mountpoint'
- minimyth)) == 0)
{
- $minimyth->message_output('err', "error: '$dvd_rip_mountpoint'
does not exist.");
+ $minimyth->message_output('err', "'$dvd_rip_mountpoint' does
not exist.");
return 0;
}
if (system(qq(/bin/su -c '/usr/bin/test ! -d $dvd_rip_mountpoint'
- minimyth)) == 0)
{
- $minimyth->message_output('err', "error: '$dvd_rip_mountpoint'
is not a directory.");
+ $minimyth->message_output('err', "'$dvd_rip_mountpoint' is not
a directory.");
return 0;
}
if (system(qq(/bin/su -c '/usr/bin/test ! -w $dvd_rip_mountpoint'
- minimyth)) == 0)
{
- $minimyth->message_output('err', "error: '$dvd_rip_mountpoint'
is not writable by user 'minimyth'.");
+ $minimyth->message_output('err', "'$dvd_rip_mountpoint' is not
writable by user 'minimyth'.");
return 0;
}
system(qq(/bin/su -c '/bin/mkdir -p $dvd_rip_mountpoint/.mtd' -
minimyth));
if (system(qq(/bin/su -c '/usr/bin/test ! -e
$dvd_rip_mountpoint/.mtd' - minimyth)) == 0)
{
-
$minimyth->message_output('err', "error: '$dvd_rip_mountpoint/.mtd' does
not exist.");
+ $minimyth->message_output('err', "'$dvd_rip_mountpoint/.mtd'
does not exist.");
return 0;
}
if (system(qq(/bin/su -c '/usr/bin/test ! -d
$dvd_rip_mountpoint/.mtd' - minimyth)) == 0)
{
-
$minimyth->message_output('err', "error: '$dvd_rip_mountpoint/.mtd' is not
a directory.");
+ $minimyth->message_output('err', "'$dvd_rip_mountpoint/.mtd'
is not a directory.");
return 0;
}
if (system(qq(/bin/su -c '/usr/bin/test ! -w
$dvd_rip_mountpoint/.mtd' - minimyth)) == 0)
{
-
$minimyth->message_output('err', "error: '$dvd_rip_mountpoint/.mtd' is not
writable by user 'minimyth'.");
+ $minimyth->message_output('err', "'$dvd_rip_mountpoint/.mtd'
is not writable by user 'minimyth'.");
return 0;
}
$minimyth->mythdb_settings_set('DVDRipLocation', "$dvd_rip_mountpoint/.mtd");
@@ -272,7 +272,7 @@
{
my $hostname = $minimyth->hostname();
$minimyth->message_log('warn',
- "warning: certain DVDs may not play.
see <http://$hostname/minimyth/document-faq.html#dvd>");
+ "certain DVDs may not play. see
<http://$hostname/minimyth/document-faq.html#dvd>");
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/time.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/time.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/time.pm
Sat Jan 3 17:23:39 2009
@@ -37,7 +37,7 @@
}
if ($ntp_success == 0)
{
- $minimyth->message_output('warn', "warning: 'ntpd' failed to
synchronize with any NTP server.");
+ $minimyth->message_output('warn', "'ntpd' failed to synchronize
with any NTP server.");
}
# Start NTP daemon.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
Sat Jan 3 17:23:39 2009
@@ -158,7 +158,7 @@
}
default
{
- $minimyth->message_output('err', "error: something is
very wrong in the 'video' init script.");
+ $minimyth->message_output('err', "something is very
wrong in the 'video' init script.");
return 0;
}
}
@@ -257,7 +257,7 @@
}
default
{
- $minimyth->message_output('err', "error: something is very
wrong in the 'video' init script.");
+ $minimyth->message_output('err', "something is very wrong in
the 'video' init script.");
return 0;
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
Sat Jan 3 17:23:39 2009
@@ -36,7 +36,7 @@
}
if ($#devices < 0)
{
- $minimyth->message_output('err', "error: no bluetooth device
found.");
+ $minimyth->message_output('err', "no bluetooth device found.");
return 0;
}
@@ -49,12 +49,12 @@
}
else
{
- $minimyth->message_output('warn', "warning: configuration
of bluetooth device '$device' failed.");
+ $minimyth->message_output('warn', "configuration of
bluetooth device '$device' failed.");
}
}
if ($device_configured == 0)
{
- $minimyth->message_output('err', "error: no bluetooth device
configured.");
+ $minimyth->message_output('err', "no bluetooth device
configured.");
return 0;
}
@@ -65,7 +65,7 @@
{
if (system(qq(/sbin/modprobe uinput > $devnull 2>&1)) != 0)
{
- $minimyth->message_output('err', "error: failed to load
kernel module: uinput");
+ $minimyth->message_output('err', "failed to load kernel
module: uinput");
return 0;
}
while (! -e q(/dev/uinput))
@@ -83,7 +83,7 @@
}
else
{
- $minimyth->message_output('err', "error: no 'wminput'
config file found.");
+ $minimyth->message_output('err', "no 'wminput' config file
found.");
return 0;
}
my $running = 0;
@@ -118,7 +118,7 @@
}
else
{
- $minimyth->message_output('err', "error: no 'wminput'
config file found.");
+ $minimyth->message_output('err', "no 'wminput' config file
found.");
return 0;
}
my $running = 0;
@@ -153,7 +153,7 @@
}
else
{
- $minimyth->message_output('err', "error: no 'wminput'
config file found.");
+ $minimyth->message_output('err', "no 'wminput' config file
found.");
return 0;
}
my $running = 0;
@@ -188,7 +188,7 @@
}
else
{
- $minimyth->message_output('err', "error: no 'wminput'
config file found.");
+ $minimyth->message_output('err', "no 'wminput' config file
found.");
return 0;
}
my $running = 0;
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
Sat Jan 3 17:23:39 2009
@@ -109,7 +109,7 @@
}
if ($device_intel eq '')
{
- $minimyth->message_output('err', "error: no X video output
enabled.");
+ $minimyth->message_output('err', "no X video output
enabled.");
return 0;
}
}
@@ -132,7 +132,7 @@
}
if ($device_nvidia eq '')
{
- $minimyth->message_output('err', "error: no X video output
enabled.");
+ $minimyth->message_output('err', "no X video output
enabled.");
return 0;
}
}
@@ -155,7 +155,7 @@
}
if ($device_via eq '')
{
- $minimyth->message_output('err', "error: no X video output
enabled.");
+ $minimyth->message_output('err', "no X video output
enabled.");
return 0;
}
}
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 Sat Jan 3
17:23:39 2009
@@ -1 +1 @@
-f08decc626dabae47b39fa83ac5388d3 download/MiniMyth.pm
+191f888a23a313a4a8715831c683ddbc 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 Sat Jan
3 17:23:39 2009
@@ -171,7 +171,9 @@
if ($self->splash_running_test)
{
system(qq(/usr/bin/logger -t minimyth -p
local0.$level "$message"));
- $self->splash_message_output($message);
+ if ($level eq 'err') { $self->splash_message_output(qq(error:
$message)); }
+ elsif ($level eq 'warn') {
$self->splash_message_output(qq(warning: $message)); }
+ else {
$self->splash_message_output(qq($message)); }
}
else
{
@@ -1098,7 +1100,7 @@
when (/^http$/ ) { $result = $self->url_http_get( $local_file,
$remote_file, $remote_server); }
when (/^hunt$/ ) { $result = $self->url_hunt_get( $local_file,
$remote_file, $remote_server); }
when (/^tftp$/ ) { $result = $self->url_tftp_get( $local_file,
$remote_file, $remote_server); }
- default { $self->message_log('err', qq(error:
MiniMyth::url_get: protocol ') . $remote_protocol . qq(' is not
supported.)); }
+ default { $self->message_log('err',
qq(MiniMyth::url_get: protocol ') . $remote_protocol . qq(' is not
supported.)); }
}
return $result;
}
@@ -1391,7 +1393,7 @@
when (/^file$/ ) { $result = $self->url_file_put( $local_file,
$remote_file, $remote_server); }
when (/^http$/ ) { $result = $self->url_http_put( $local_file,
$remote_file, $remote_server); }
when (/^tftp$/ ) { $result = $self->url_tftp_put( $local_file,
$remote_file, $remote_server); }
- default { $self->message_log('err', qq(error:
MiniMyth::url_put: protocol ') . $_ . qq(' is not supported.)); }
+ default { $self->message_log('err',
qq(MiniMyth::url_put: protocol ') . $_ . qq(' is not supported.)); }
}
return $result;
}
@@ -2568,7 +2570,7 @@
{
my $message = $@;
- $self->message_output('err', qq(error: 'require $package'
failed.));
+ $self->message_output('err', qq('require $package' failed.));
if ($message)
{
@@ -2577,7 +2579,7 @@
{
print FILE $message;
close(FILE);
- $self->message_output('err', qq(error: ckeck '$logfile'
for details.));
+ $self->message_output('err', qq(ckeck '$logfile' for
details.));
}
}
return 0;
@@ -2595,7 +2597,7 @@
if (! $self->package_member_exists($package, $member))
{
my $function = $package . '::' . $member;
- $self->message_output('err', qq(error: '$function' does not
exist.));
+ $self->message_output('err', qq('$function' does not exist.));
return 0;
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
