[PATCH v2 lkp-tests 2/2] lib/job.rb: fix duplicate default field - Compass-ci

15 Dec 2020

input:
 /etc/commpass-ci/default/crystal.yaml
    lab: lab1
 ~/.config/.compass-ci/default/*.yaml
    lab: lab2
original output:
 #! /etc/commpass-ci/default/crystal.yaml
 lab: lab2
 #! ~/.config/.compass-ci/default/*.yaml
now output:
 #! /etc/commpass-ci/default/crystal.yaml
 #! ~/.config/.compass-ci/default/*.yaml
 lab: lab2
Signed-off-by: Wei Jihui weijihuiall@163.com
---
 lib/job.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/job.rb b/lib/job.rb
index 9eac4001..781a24a4 100755
--- a/lib/job.rb
+++ b/lib/job.rb
@@ -405,6 +405,7 @@ class Job
       return false
     end
     if defaults.is_a?(Hash) && !defaults.empty?
+      @defaults.delete_if { |key, _| defaults.keys.include?(key) }
       @defaults[source_file_symkey(file)] = nil
       revise_hash(@defaults, defaults, true)
       @defaults.merge!(@overrides)
-- 
2.23.0

    