Author: rob
Date: Mon Mar 7 12:30:27 2011
New Revision: 26190
URL: https://svn.nixos.org/websvn/nix/?rev=26190&sc=1
Log:
revert commit 26130, use hardcoded default value for HYDRA_DATA (/var/lib/hydra)
Added:
hydra/trunk/src/lib/Hydra/Helper/Nix.pm
- copied, changed from r26189, hydra/trunk/src/lib/Hydra/Helper/Nix.pm.in
Deleted:
hydra/trunk/src/lib/Hydra/Helper/Nix.pm.in
Modified:
hydra/trunk/configure.ac
hydra/trunk/src/lib/Makefile.am
Modified: hydra/trunk/configure.ac
==============================================================================
--- hydra/trunk/configure.ac Mon Mar 7 12:17:12 2011 (r26189)
+++ hydra/trunk/configure.ac Mon Mar 7 12:30:27 2011 (r26190)
@@ -55,7 +55,6 @@
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 (from r26189,
hydra/trunk/src/lib/Hydra/Helper/Nix.pm.in)
==============================================================================
--- hydra/trunk/src/lib/Hydra/Helper/Nix.pm.in Mon Mar 7 12:17:12 2011
(r26189, copy source)
+++ hydra/trunk/src/lib/Hydra/Helper/Nix.pm Mon Mar 7 12:30:27 2011
(r26190)
@@ -24,7 +24,8 @@
sub getHydraPath {
- my $dir = $ENV{"HYDRA_DATA"} || "@localstatedir@/lib/hydra";
+ my $dir = $ENV{"HYDRA_DATA"} || "/var/lib/hydra";
+ die "The HYDRA_DATA directory does not exist!\n" unless -d $dir;
return $dir;
}
Modified: hydra/trunk/src/lib/Makefile.am
==============================================================================
--- hydra/trunk/src/lib/Makefile.am Mon Mar 7 12:17:12 2011 (r26189)
+++ hydra/trunk/src/lib/Makefile.am Mon Mar 7 12:30:27 2011 (r26190)
@@ -10,8 +10,7 @@
$(wildcard Hydra/Base/Controller/*.pm)
EXTRA_DIST = \
- $(PERL_MODULES) \
- Hydra/Helper/Nix.pm.in
+ $(PERL_MODULES)
hydradir = $(libexecdir)/hydra/lib
nobase_hydra_DATA = $(PERL_MODULES)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
