Author: ludo
Date: Wed Mar 2 15:17:03 2011
New Revision: 26130
URL: https://svn.nixos.org/websvn/nix/?rev=26130&sc=1
Log:
Set a default value for `getHydraPath'.
Added:
hydra/trunk/src/lib/Hydra/Helper/Nix.pm.in
- copied, changed from r25879, hydra/trunk/src/lib/Hydra/Helper/Nix.pm
Deleted:
hydra/trunk/src/lib/Hydra/Helper/Nix.pm
Modified:
hydra/trunk/configure.ac
hydra/trunk/src/lib/Makefile.am
Modified: hydra/trunk/configure.ac
==============================================================================
--- hydra/trunk/configure.ac Wed Mar 2 10:24:18 2011 (r26129)
+++ hydra/trunk/configure.ac Wed Mar 2 15:17:03 2011 (r26130)
@@ -55,6 +55,7 @@
src/sql/Makefile
src/xsl/Makefile
src/lib/Makefile
+ src/lib/Hydra/Helper/Nix.pm
src/root/Makefile
src/script/Makefile
Copied and modified: hydra/trunk/src/lib/Hydra/Helper/Nix.pm.in (from r25879,
hydra/trunk/src/lib/Hydra/Helper/Nix.pm)
==============================================================================
--- hydra/trunk/src/lib/Hydra/Helper/Nix.pm Thu Feb 10 10:35:26 2011
(r25879, copy source)
+++ hydra/trunk/src/lib/Hydra/Helper/Nix.pm.in Wed Mar 2 15:17:03 2011
(r26130)
@@ -24,9 +24,7 @@
sub getHydraPath {
- my $dir = $ENV{"HYDRA_DATA"};
- die "The HYDRA_DATA environment variable is not set!\n" unless defined
$dir;
- die "The HYDRA_DATA directory does not exist!\n" unless -d $dir;
+ my $dir = $ENV{"HYDRA_DATA"} || "@localstatedir@/lib/hydra";
return $dir;
}
Modified: hydra/trunk/src/lib/Makefile.am
==============================================================================
--- hydra/trunk/src/lib/Makefile.am Wed Mar 2 10:24:18 2011 (r26129)
+++ hydra/trunk/src/lib/Makefile.am Wed Mar 2 15:17:03 2011 (r26130)
@@ -1,12 +1,15 @@
-PERL_MODULES = \
- $(wildcard *.pm) \
- $(wildcard Hydra/*.pm) \
- $(wildcard Hydra/Helper/*.pm) \
- $(wildcard Hydra/Model/*.pm) \
- $(wildcard Hydra/View/*.pm) \
- $(wildcard Hydra/Schema/*.pm) \
- $(wildcard Hydra/Controller/*.pm) \
- $(wildcard Hydra/Base/*.pm) \
+PERL_MODULES = \
+ $(wildcard *.pm) \
+ $(wildcard Hydra/*.pm) \
+ Hydra/Helper/AddBuilds.pm \
+ Hydra/Helper/CatalystUtils.pm \
+ Hydra/Helper/Nix.pm.in \
+ $(wildcard Hydra/Helper/*.pm) \
+ $(wildcard Hydra/Model/*.pm) \
+ $(wildcard Hydra/View/*.pm) \
+ $(wildcard Hydra/Schema/*.pm) \
+ $(wildcard Hydra/Controller/*.pm) \
+ $(wildcard Hydra/Base/*.pm) \
$(wildcard Hydra/Base/Controller/*.pm)
EXTRA_DIST = $(PERL_MODULES)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
