s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the logic to apply the test-driver patch only when needed.

Browse source
This commit is contained in:
r-vdp 2023-05-25 18:31:58 +02:00
parent 81c9b152d1
commit cecf202ff4
No known key found for this signature in database
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix/lib.nix
View file

@ -16,7 +16,6 @@ in
makeSystemConfig = makeSystemConfig =
{ modules { modules
, extraSpecialArgs ? { } , extraSpecialArgs ? { }
,
}: }:
let let
# Module that sets additional module arguments # Module that sets additional module arguments
@ -451,7 +450,7 @@ in
in in
'' ''
echo "Try to apply patch ${patchFile}..." echo "Try to apply patch ${patchFile}..."
if ${patch} --reverse -p1 --silent --force --dry-run --input=${patchFile}; then if grep --quiet --fixed-strings "bash" test_driver/machine.py; then
echo "Patch already present, ignoring..." echo "Patch already present, ignoring..."
else else
${patch} -p1 < ${patchFile} ${patch} -p1 < ${patchFile}