From e1b206b4a9c895e6684fc948b1526d8759e54328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Tue, 4 Feb 2014 16:32:50 +0100 Subject: [PATCH] clarify rename error messages --- nixos/modules/rename.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 6ff5277cf9ca..15e05a3d675d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -12,18 +12,20 @@ let visible = true; }; + # warn option was renamed obsolete = from: to: rename { inherit from to; name = "Obsolete name"; - use = x: builtins.trace "Obsolete option `${showOption from}' is used instead of `${showOption to}'." x; - define = x: builtins.trace "Obsolete option `${showOption from}' is defined instead of `${showOption to}'." x; + use = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x; + define = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x; }; + # abort if deprecated option is used deprecated = from: to: rename { inherit from to; name = "Deprecated name"; - use = x: abort "Deprecated option `${showOption from}' is used instead of `${showOption to}'."; - define = x: abort "Deprecated option `${showOption from}' is defined instead of `${showOption to}'."; + use = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'."; + define = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; showOption = concatStringsSep ".";