@@ -1463,7 +1463,7 @@ def prepare_for_extensions(self):
1463
1463
def skip_extensions (self ):
1464
1464
"""
1465
1465
Called when self.skip is True
1466
- - use this to detect existing extensions and to remove them from self.exts
1466
+ - use this to detect existing extensions and to remove them from self.ext_instances
1467
1467
- based on initial R version
1468
1468
"""
1469
1469
# obtaining untemplated reference value is required here to support legacy string templates like name/version
@@ -1482,7 +1482,7 @@ def skip_extensions(self):
1482
1482
self .log .debug ("exit code: %s, stdout/err: %s" , ec , cmdstdouterr )
1483
1483
res .append (ext_inst )
1484
1484
else :
1485
- self . log . info ("Skipping %s" , ext_inst .name )
1485
+ print_msg ("Skipping extension %s" % ext_inst .name , silent = self . silent , log = self . log )
1486
1486
1487
1487
self .ext_instances = res
1488
1488
@@ -2148,19 +2148,19 @@ def extensions_step(self, fetch=False):
2148
2148
if self .skip :
2149
2149
self .skip_extensions ()
2150
2150
2151
- exts_cnt = len (self .exts )
2152
- for idx , ( ext , ext_instance ) in enumerate (zip ( self .exts , self . ext_instances ) ):
2151
+ exts_cnt = len (self .ext_instances )
2152
+ for idx , ext in enumerate (self .ext_instances ):
2153
2153
2154
- self .log .debug ("Starting extension %s" % ext [ ' name' ] )
2154
+ self .log .debug ("Starting extension %s" % ext . name )
2155
2155
2156
2156
# always go back to original work dir to avoid running stuff from a dir that no longer exists
2157
2157
change_dir (self .orig_workdir )
2158
2158
2159
- tup = (ext [ ' name' ] , ext .get ( ' version' , '' ) , idx + 1 , exts_cnt )
2159
+ tup = (ext . name , ext .version , idx + 1 , exts_cnt )
2160
2160
print_msg ("installing extension %s %s (%d/%d)..." % tup , silent = self .silent )
2161
2161
2162
2162
if self .dry_run :
2163
- tup = (ext [ ' name' ] , ext .get ( ' version' , '' ) , cls .__name__ )
2163
+ tup = (ext . name , ext .version , cls .__name__ )
2164
2164
msg = "\n * installing extension %s %s using '%s' easyblock\n " % tup
2165
2165
self .dry_run_msg (msg )
2166
2166
@@ -2173,15 +2173,15 @@ def extensions_step(self, fetch=False):
2173
2173
else :
2174
2174
# don't reload modules for toolchain, there is no need since they will be loaded already;
2175
2175
# the (fake) module for the parent software gets loaded before installing extensions
2176
- ext_instance .toolchain .prepare (onlymod = self .cfg ['onlytcmod' ], silent = True , loadmod = False ,
2177
- rpath_filter_dirs = self .rpath_filter_dirs )
2176
+ ext .toolchain .prepare (onlymod = self .cfg ['onlytcmod' ], silent = True , loadmod = False ,
2177
+ rpath_filter_dirs = self .rpath_filter_dirs )
2178
2178
2179
2179
# real work
2180
- ext_instance .prerun ()
2181
- txt = ext_instance .run ()
2180
+ ext .prerun ()
2181
+ txt = ext .run ()
2182
2182
if txt :
2183
2183
self .module_extra_extensions += txt
2184
- ext_instance .postrun ()
2184
+ ext .postrun ()
2185
2185
2186
2186
# cleanup (unload fake module, remove fake module dir)
2187
2187
if fake_mod_data :
0 commit comments