diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-05-07 15:13:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-05-07 15:13:43 +0000 |
| commit | 5564bd26357a6ba4a21145af189f59319d36dd45 (patch) | |
| tree | b7c33a2ac06e4203d7657fa27798fd72d0193f15 /pkgs/lib | |
| parent | a3d73679b7fbfa9963968ed4424a973ef2b614e7 (diff) | |
* Make stack traces more consistent.
svn path=/nixpkgs/trunk/; revision=21652
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/modules.nix | 4 | ||||
| -rw-r--r-- | pkgs/lib/properties.nix | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 3808893c14feb..6457fd14eb597 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -219,7 +219,7 @@ rec { decl = lib.addErrorContext "${eol - }while enhancing option '${addName name}'.${eol + }while enhancing option `${addName name}':${eol }${errorSource declarations}${eol }" ( addOptionMakeUp @@ -270,7 +270,7 @@ rec { value = lib.addErrorContext "${eol - }while evaluating the option '${addName name}'.${eol + }while evaluating the option `${addName name}':${eol }${errorSource (modulesOf name)}${eol }" ( let opt = option.decl; in diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix index 5950ec54791f5..592dc9c4bcb1e 100644 --- a/pkgs/lib/properties.nix +++ b/pkgs/lib/properties.nix @@ -73,7 +73,7 @@ rec { let cleanAttrs = rmProperties attrs; in if isProperty attrs then iter (a: v: - lib.addErrorContext "while moving properties on the attribute `${a}'." ( + lib.addErrorContext "while moving properties on the attribute `${a}':" ( triggerPropertiesGlobalDelay a ( triggerPropertiesDelay a ( copyProperties attrs v @@ -88,7 +88,7 @@ rec { triggerPropertiesDelay = name: attrs: let callOnDelay = p@{property, ...}: - lib.addErrorContext "while calling a onDelay function." ( + lib.addErrorContext "while calling an `onDelay' function:" ( if property ? onDelay then property.onDelay name p else @@ -111,7 +111,7 @@ rec { }; callOnGlobalDelay = property: content: - lib.addErrorContext "while calling a onGlobalDelay function." ( + lib.addErrorContext "while calling an `onGlobalDelay' function:" ( property.onGlobalDelay name content ); in @@ -124,7 +124,7 @@ rec { evalProperties = valList: if valList != [] then filter (x: !isNotdef x) ( - lib.addErrorContext "while evaluating properties." ( + lib.addErrorContext "while evaluating properties:" ( triggerPropertiesGlobalEval ( evalLocalProperties valList ))) @@ -133,14 +133,14 @@ rec { evalLocalProperties = valList: filter (x: !isNotdef x) ( - lib.addErrorContext "while evaluating local properties." ( + lib.addErrorContext "while evaluating local properties:" ( map triggerPropertiesEval valList )); # Call onEval function triggerPropertiesEval = val: foldProperty (p@{property, ...}: - lib.addErrorContext "while calling a onEval function." ( + lib.addErrorContext "while calling an `onEval' function:" ( if property ? onEval then property.onEval p else @@ -165,7 +165,7 @@ rec { }; callOnGlobalEval = property: valList: - lib.addErrorContext "while calling a onGlobalEval function." ( + lib.addErrorContext "while calling an `onGlobalEval' function:" ( property.onGlobalEval valList ); in |