Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 507493: checksetup.pl's output should use colors for missing and too old Perl modules - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@258069 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com
2009-08-12 13:05:44 +00:00
parent 5999a71f89
commit 59efe475d7
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
View File

@@ -29,6 +29,7 @@ use Bugzilla::Constants;
use Bugzilla::Install::Util qw(vers_cmp install_string);
use List::Util qw(max);
use Safe;
use Term::ANSIColor;
use base qw(Exporter);
our @EXPORT = qw(
@@ -429,8 +430,8 @@ sub print_module_instructions {
if (vers_cmp($perl_ver, '5.10') > -1) {
$url_to_theory58S = 'http://cpan.uwinnipeg.ca/PPMPackages/10xx/';
}
print install_string('ppm_repo_add',
{ theory_url => $url_to_theory58S });
print colored(install_string('ppm_repo_add',
{ theory_url => $url_to_theory58S }), 'red');
# ActivePerls older than revision 819 require an additional command.
if (_get_activestate_build_id() < 819) {
print install_string('ppm_repo_up');
@@ -463,7 +464,7 @@ sub print_module_instructions {
}
if (my @missing = @{$check_results->{missing}}) {
print install_string('commands_required') . "\n";
print colored(install_string('commands_required'), 'red') . "\n";
foreach my $package (@missing) {
my $command = install_command($package);
print " $command\n";
@@ -473,6 +474,9 @@ sub print_module_instructions {
if ($output && $check_results->{any_missing} && !ON_WINDOWS) {
print install_string('install_all', { perl => $^X });
}
if (!$check_results->{pass}) {
print colored(install_string('installation_failed'), 'red') . "\n\n";
}
}
sub _translate_feature {
@@ -562,8 +566,9 @@ sub have_vers {
my $want_string = $wanted ? "v$wanted" : install_string('any');
$ok = "$ok:" if $ok;
printf "%s %19s %-9s $ok $vstr $black_string\n",
install_string('checking_for'), $package, "($want_string)";
my $str = sprintf "%s %19s %-9s $ok $vstr $black_string\n",
install_string('checking_for'), $package, "($want_string)";
print $vok ? $str : colored($str, 'red');
}
return $vok ? 1 : 0;

10
mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
View File

@@ -43,6 +43,7 @@ our @EXPORT_OK = qw(
template_include_path
vers_cmp
get_console_locale
init_console
);
sub bin_loc {
@@ -332,6 +333,11 @@ sub get_console_locale {
return $locale;
}
sub init_console {
eval { ON_WINDOWS && require Win32::Console::ANSI; };
$ENV{'ANSI_COLORS_DISABLED'} = 1 if ($@ || !-t *STDOUT);
$ENV{'HTTP_ACCEPT_LANGUAGE'} ||= get_console_locale();
}
# This is like request_cache, but it's used only by installation code
# for setup.cgi and things like that.
@@ -395,6 +401,10 @@ running, what perl version we're using, and what OS we're running on.
Returns the language to use based on the LC_CTYPE value returned by the OS.
If LC_CTYPE is of the form fr-CH, then fr is appended to the list.
=item C<init_console>
Sets the C<ANSI_COLORS_DISABLED> and C<HTTP_ACCEPT_LANGUAGE> environment variables.
=item C<indicate_progress>
=over

4
mozilla/webtools/bugzilla/checksetup.pl
View File

@@ -53,7 +53,7 @@ BEGIN { chdir dirname($0); }
use lib qw(. lib);
use Bugzilla::Constants;
use Bugzilla::Install::Requirements;
use Bugzilla::Install::Util qw(install_string get_version_and_os get_console_locale);
use Bugzilla::Install::Util qw(install_string get_version_and_os init_console);
######################################################################
# Live Code
@@ -61,7 +61,7 @@ use Bugzilla::Install::Util qw(install_string get_version_and_os get_console_loc
# When we're running at the command line, we need to pick the right
# language before ever displaying any string.
$ENV{'HTTP_ACCEPT_LANGUAGE'} ||= get_console_locale();
init_console();
my %switch;
GetOptions(\%switch, 'help|h|?', 'check-modules', 'no-templates|t',

1
mozilla/webtools/bugzilla/template/en/default/setup/strings.txt.pl
View File

@@ -79,6 +79,7 @@ then the value of the ##column## column that needs to be fixed:
EOT
install_module => 'Installing ##module## version ##version##...',
installation_failed => '*** Installation aborted. Read the messages above. ***',
max_allowed_packet => <<EOT,
WARNING: You need to set the max_allowed_packet parameter in your MySQL
configuration to at least ##needed##. Currently it is set to ##current##.