lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Fix "Use of uninitialized value $mode"

Browse source
This commit is contained in:
Eelco Dolstra 2015-10-09 15:06:57 +02:00
parent ca58e97691
commit 3fa3e6414c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib/Hydra/Controller/Build.pm
View file

@ -134,6 +134,7 @@ sub view_log : Chained('buildChain') PathPart('log') {
sub showLog { sub showLog {
my ($c, $mode, $finished, $drvPath, @outPaths) = @_; my ($c, $mode, $finished, $drvPath, @outPaths) = @_;
$mode //= "pretty";
my $logPath = findLog($c, $drvPath, @outPaths); my $logPath = findLog($c, $drvPath, @outPaths);
@ -146,7 +147,7 @@ sub showLog {
|| (($mode eq "tail" || $mode eq "tail-reload") && $logPath !~ /\.bz2$/) || (($mode eq "tail" || $mode eq "tail-reload") && $logPath !~ /\.bz2$/)
|| $size < 64 * 1024 * 1024; || $size < 64 * 1024 * 1024;
if (!$mode) { if ($mode eq "pretty") {
# !!! quick hack # !!! quick hack
my $pipeline = ($logPath =~ /.bz2$/ ? "bzip2 -d < $logPath" : "cat $logPath") my $pipeline = ($logPath =~ /.bz2$/ ? "bzip2 -d < $logPath" : "cat $logPath")
. " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -" . " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"