File tree Expand file tree Collapse file tree 1 file changed +8
-5
lines changed
Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Original file line number Diff line number Diff line change 3434import getpass
3535import glob
3636import functools
37+ import itertools
3738import os
3839import random
3940import re
@@ -1013,11 +1014,13 @@ def is_patch_for(patch_name, ec):
10131014
10141015 patches = copy .copy (ec ['patches' ])
10151016
1016- for ext in ec .get_ref ('exts_list' ):
1017- if isinstance (ext , (list , tuple )) and len (ext ) == 3 and isinstance (ext [2 ], dict ):
1018- templates = {'name' : ext [0 ], 'version' : ext [1 ]}
1019- ext_options = ext [2 ]
1020- patches .extend (p % templates for p in ext_options .get ('patches' , []))
1017+ with ec .disable_templating ():
1018+ for ext in itertools .chain (ec ['exts_list' ], ec .get ('components' , [])):
1019+ if isinstance (ext , (list , tuple )) and len (ext ) == 3 and isinstance (ext [2 ], dict ):
1020+ templates = {'name' : ext [0 ], 'version' : ext [1 ]}
1021+ ext_options = ext [2 ]
1022+ patches .extend (p [0 ] % templates if isinstance (p , (tuple , list )) else p % templates
1023+ for p in ext_options .get ('patches' , []))
10211024
10221025 for patch in patches :
10231026 if isinstance (patch , (tuple , list )):
You can’t perform that action at this time.
0 commit comments