Permalink
Browse files

Update error output to suggest changing MaxBuildJobs

Add MaxBuildJobs setting to diagnostic information when there's an error.

Add text suggesting people reconfigure MaxBuildJobs and try again.

Conditionalize text about MaxBuildJobs.

Further updates

Fix formatting
  • Loading branch information...
1 parent 195558c commit d0160972f5fdfb3ef326e5139c957a6e60b4be52 @akhansen akhansen committed Oct 29, 2011
Showing with 8 additions and 2 deletions.
  1. +8 −2 perlmod/Fink/PkgVersion.pm
View
@@ -5339,6 +5339,7 @@ Text displayed prior to the standard error-message block.
sub package_error {
my $self = shift;
my %opts = @_;
+ my $mbj=$config->param('MaxBuildJobs');
my $notifier = Fink::Notify->new();
my $error = "phase " . $opts{'phase'} . ": " . $self->get_fullname()." failed";
@@ -5347,8 +5348,12 @@ sub package_error {
$error .= "\n\n" . $opts{'preamble'};
}
$error .= "\n\n" .
- "Before reporting any errors, please run \"fink selfupdate\" and try again.\n" .
- "If you continue to have issues, please check to see if the FAQ on Fink's \n".
+ "Before reporting any errors, please run \"fink selfupdate\" and try again.\n" ;
+ if ($mbj > 1) {
+ $error .= "Also try using \"fink configure\" to set your maximum build jobs to 1 and\n" .
+ "attempt to build the package again." ;
+ }
+ $error .= "\nIf you continue to have issues, please check to see if the FAQ on Fink's \n".
"website solves the problem. If not, ask on one of these mailing lists:\n\n" .
"\tThe Fink Users List <fink-users\@lists.sourceforge.net>\n".
"\tThe Fink Beginners List <fink-beginners\@lists.sourceforge.net>";
@@ -5397,6 +5402,7 @@ sub package_error {
} else {
$error .= "No recognized Xcode installed\n";
}
+ $error .= "Max. Fink build jobs: ".$config->param('MaxBuildJobs')."\n";
}
# need trailing newline in the actual die/warn to prevent

0 comments on commit d016097

Please sign in to comment.