File tree Expand file tree Collapse file tree 3 files changed +2
-9
lines changed Expand file tree Collapse file tree 3 files changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -1296,15 +1296,13 @@ def test_clear(self) -> None:
1296
1296
n .includes = 'testincludes'
1297
1297
n .Tag ('found_includes' , {'testkey' :'testvalue' })
1298
1298
n .implicit = 'testimplicit'
1299
- n .cached = 1
1300
1299
1301
1300
x = MyExecutor ()
1302
1301
n .set_executor (x )
1303
1302
1304
1303
n .clear ()
1305
1304
1306
1305
assert n .includes is None , n .includes
1307
- assert n .cached == 0 , n .cached
1308
1306
assert x .cleaned_up
1309
1307
1310
1308
def test_get_subst_proxy (self ) -> None :
Original file line number Diff line number Diff line change @@ -588,7 +588,6 @@ def __init__(self) -> None:
588
588
self .pseudo = False
589
589
self .noclean = 0
590
590
self .nocache = 0
591
- self .cached = 0 # is this node pulled from cache?
592
591
self .always_build = None
593
592
self .includes = None
594
593
self .attributes = self .Attrs () # Generic place to stick information about the Node.
@@ -864,7 +863,6 @@ def clear(self) -> None:
864
863
delattr (self , attr )
865
864
except AttributeError :
866
865
pass
867
- self .cached = 0
868
866
self .includes = None
869
867
870
868
def clear_memoized_values (self ) -> None :
Original file line number Diff line number Diff line change @@ -244,9 +244,8 @@ def execute(self):
244
244
SCons .Warnings .warn (SCons .Warnings .CacheCleanupErrorWarning ,
245
245
"Failed copying all target files from cache, Error while attempting to remove file %s retrieved from cache: %s" % (t .get_internal_path (), e ))
246
246
self .targets [0 ].build ()
247
- else :
248
- for t in cached_targets :
249
- t .cached = 1
247
+ for t in self .targets :
248
+ t .push_to_cache ()
250
249
except SystemExit :
251
250
exc_value = sys .exc_info ()[1 ]
252
251
raise SCons .Errors .ExplicitExit (self .targets [0 ], exc_value .code )
@@ -299,8 +298,6 @@ def executed_with_callbacks(self) -> None:
299
298
for side_effect in t .side_effects :
300
299
side_effect .set_state (NODE_NO_STATE )
301
300
t .set_state (NODE_EXECUTED )
302
- if not t .cached :
303
- t .push_to_cache ()
304
301
t .built ()
305
302
t .visited ()
306
303
if (not print_prepare and
You can’t perform that action at this time.
0 commit comments