Fix the logic to apply the test-driver patch only when needed.
This commit is contained in:
parent
81c9b152d1
commit
cecf202ff4
1 changed files with 1 additions and 2 deletions
|
|
@ -16,7 +16,6 @@ in
|
|||
makeSystemConfig =
|
||||
{ modules
|
||||
, extraSpecialArgs ? { }
|
||||
,
|
||||
}:
|
||||
let
|
||||
# Module that sets additional module arguments
|
||||
|
|
@ -451,7 +450,7 @@ in
|
|||
in
|
||||
''
|
||||
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..."
|
||||
else
|
||||
${patch} -p1 < ${patchFile}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue