From c5ceece093425eaad10fb3bbc41b3a48f779264e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 2 Sep 2010 08:56:29 +0000 Subject: [PATCH] hydra: moved getbuildlog --- src/lib/Hydra/Helper/AddBuilds.pm | 10 +++++++++- src/script/hydra_build.pl | 7 ------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm index 01fa7cb4..576d4902 100644 --- a/src/lib/Hydra/Helper/AddBuilds.pm +++ b/src/lib/Hydra/Helper/AddBuilds.pm @@ -10,12 +10,20 @@ use Digest::SHA qw(sha256_hex); use File::Path; our @ISA = qw(Exporter); -our @EXPORT = qw(fetchInput evalJobs checkBuild inputsToArgs captureStdoutStderr getReleaseName); +our @EXPORT = qw(fetchInput evalJobs checkBuild inputsToArgs captureStdoutStderr getReleaseName getBuildLog); sub scmPath { return getHydraPath . "/scm" ; } + +sub getBuildLog { + my ($drvPath) = @_; + my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath; + return -e $logPath ? $logPath : undef; +} + + sub getStorePathHash { my ($storePath) = @_; my $hash = `nix-store --query --hash $storePath` diff --git a/src/script/hydra_build.pl b/src/script/hydra_build.pl index 24224c7a..c89c72b3 100755 --- a/src/script/hydra_build.pl +++ b/src/script/hydra_build.pl @@ -26,13 +26,6 @@ my $db = openHydraDB; my %config = new Config::General($ENV{"HYDRA_CONFIG"})->getall; -sub getBuildLog { - my ($drvPath) = @_; - my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath; - return -e $logPath ? $logPath : undef; -} - - sub sendTwitterNotification { my ($build) = @_;