File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -119,12 +119,14 @@ def get_torque_params(candidate, default=float('NaN')):
119
119
with open (TORQUE_PARAMS_PATH ) as f :
120
120
params = yaml .load (f , Loader = yaml .FullLoader )
121
121
with open (TORQUE_OVERRIDE_PATH ) as f :
122
- params_override = yaml .load (f , Loader = yaml .FullLoader )
122
+ override = yaml .load (f , Loader = yaml .FullLoader )
123
123
124
- assert len (set (sub .keys ()) & set (params .keys ()) & set (params_override .keys ())) == 0
124
+ # Ensure no overlap
125
+ if sum ([candidate in x for x in [sub , params , override ]]) > 1 :
126
+ raise RuntimeError (f'{ candidate } is defined twice in torque config' )
125
127
126
- if candidate in params_override :
127
- out = params_override [candidate ]
128
+ if candidate in override :
129
+ out = override [candidate ]
128
130
elif candidate in params :
129
131
out = params [candidate ]
130
132
else :
You can’t perform that action at this time.
0 commit comments