tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / development / libraries / umockdev / substitute-udevadm.patch
at 24.05-beta 41 lines 1.6 kB view raw
1From 09efbe8090f501c60975d5467fb587ed633d6a01 Mon Sep 17 00:00:00 2001 2From: Florian Klink <flokli@flokli.de> 3Date: Wed, 24 Jan 2024 14:29:28 +0200 4Subject: [PATCH] substitute udevadm 5 6--- 7 src/umockdev-record.vala | 2 +- 8 tests/test-umockdev-run.vala | 4 ++-- 9 2 files changed, 3 insertions(+), 3 deletions(-) 10 11diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala 12index 2d49bc8..272f25e 100644 13--- a/src/umockdev-record.vala 14+++ b/src/umockdev-record.vala 15@@ -223,7 +223,7 @@ record_device(string dev) 16 int exitcode; 17 try { 18 Process.spawn_sync(null, 19- {"udevadm", "info", "--query=all", "--path", dev}, 20+ {"@udevadm@", "info", "--query=all", "--path", dev}, 21 null, 22 SpawnFlags.SEARCH_PATH, 23 null, 24diff --git a/tests/test-umockdev-run.vala b/tests/test-umockdev-run.vala 25index cd00a08..94616cb 100644 26--- a/tests/test-umockdev-run.vala 27+++ b/tests/test-umockdev-run.vala 28@@ -199,8 +199,8 @@ A: size=1048576\n 29 30 // unfortunately the udevadm output between distros is not entirely constant 31 assert (get_program_out ( 32- "udevadm", 33- umockdev_run_command + "-d " + umockdev_file + " -- udevadm info --query=all --name=/dev/loop23", 34+ "@udevadm@", 35+ umockdev_run_command + "-d " + umockdev_file + " -- @udevadm@ info --query=all --name=/dev/loop23", 36 out sout, out serr, out exit)); 37 38 assert_cmpstr (serr, CompareOperator.EQ, ""); 39-- 402.43.0 41