Author: eelco
Date: Sun Mar 4 16:17:56 2012
New Revision: 32775
URL: https://nixos.org/websvn/nix/?rev=32775&sc=1
Log:
* Upstart jobs: don't emit a description if there is none.
Modified:
nixos/trunk/modules/system/upstart/upstart.nix
Modified: nixos/trunk/modules/system/upstart/upstart.nix
==============================================================================
--- nixos/trunk/modules/system/upstart/upstart.nix Sun Mar 4 16:10:19
2012 (r32774)
+++ nixos/trunk/modules/system/upstart/upstart.nix Sun Mar 4 16:17:56
2012 (r32775)
@@ -25,7 +25,9 @@
''
# Upstart job `${job.name}'. This is a generated file. Do not edit.
- description "${job.description}"
+ ${optionalString (job.description != "") ''
+ description "${job.description}"
+ ''}
${if isList job.startOn then
"start on ${concatStringsSep " or " job.startOn}"
@@ -144,7 +146,7 @@
description = mkOption {
type = types.string;
- default = "(no description given)";
+ default = "";
description = ''
A short description of this job.
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
