Author: eelco
Date: Mon May 9 15:20:56 2011
New Revision: 27201
URL: https://svn.nixos.org/websvn/nix/?rev=27201&sc=1
Log:
* Warn if the network model doesn't evaluate, but still show the
deployment state.
Modified:
cloud/trunk/default.nix
cloud/trunk/src/nixos-deploy-network.pl
Modified: cloud/trunk/default.nix
==============================================================================
--- cloud/trunk/default.nix Mon May 9 15:16:34 2011 (r27200)
+++ cloud/trunk/default.nix Mon May 9 15:20:56 2011 (r27201)
@@ -17,6 +17,6 @@
cp *.nix $out/bin/ # urgh
wrapProgram $out/bin/nixos-deploy-network \
- --set PERL5LIB $PERL5LIB
+ --set PERL5LIB $PERL5LIB
'';
}
Modified: cloud/trunk/src/nixos-deploy-network.pl
==============================================================================
--- cloud/trunk/src/nixos-deploy-network.pl Mon May 9 15:16:34 2011
(r27200)
+++ cloud/trunk/src/nixos-deploy-network.pl Mon May 9 15:20:56 2011
(r27201)
@@ -39,8 +39,8 @@
sub opInfo {
- evalMachineInfo();
- readState();
+ eval { evalMachineInfo(); }; warn $@ if $@;
+ eval { readState(); }; warn $@ if $@;
my @lines;
foreach my $name (uniq (sort (keys %{$spec->{machines}}, keys
%{$state->{machines}}))) {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
