From b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 5 Feb 2016 14:56:06 +0100 Subject: [PATCH] nixos/udev: Fix printing impure FHS paths The test only checked for existence of the rule file in the output path of the rulefile generator. However, we also need to check whether the basename of the file is also the one we're currently searching for. Signed-off-by: aszlig --- nixos/modules/services/hardware/udev.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 74200eec4c0..1b3333a2973 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -104,10 +104,10 @@ let remoteFile="origin unknown" for i in ${toString cfg.packages}; do for j in "$i"/*/udev/rules.d/*; do - if [ -e "$out/$(basename "$j")" ]; then - remoteFile="originally from $j" - break 2 - fi + [ -e "$out/$(basename "$j")" ] || continue + [ "$(basename "$j")" = "$(basename "$localFile")" ] || continue + remoteFile="originally from $j" + break 2 done done refs="$(