bitbake/build.py: Ditch the extract_stamp function as its just going to complicate improving the stamp handling functions

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-01-06 15:41:39 +00:00
parent 37391f667f
commit 51a2e8712a
1 changed files with 9 additions and 10 deletions

View File

@ -373,25 +373,24 @@ def exec_task(fn, task, d):
event.fire(failedevent, d) event.fire(failedevent, d)
return 1 return 1
def extract_stamp(d, fn):
"""
Extracts stamp format which is either a data dictionary (fn unset)
or a dataCache entry (fn set).
"""
if fn:
return d.stamp[fn]
return data.getVar('STAMP', d, 1)
def stamp_internal(task, d, file_name): def stamp_internal(task, d, file_name):
""" """
Internal stamp helper function Internal stamp helper function
Removes any stamp for the given task Removes any stamp for the given task
Makes sure the stamp directory exists Makes sure the stamp directory exists
Returns the stamp path+filename Returns the stamp path+filename
In the bitbake core, d can be a CacheData and file_name will be set.
When called in task context, d will be a data store, file_name will not be set
""" """
stamp = extract_stamp(d, file_name) if file_name:
stamp = d.stamp[file_name]
else:
stamp = d.getVar('STAMP', True)
if not stamp: if not stamp:
return return
stamp = "%s.%s" % (stamp, task) stamp = "%s.%s" % (stamp, task)
bb.utils.mkdirhier(os.path.dirname(stamp)) bb.utils.mkdirhier(os.path.dirname(stamp))
# Remove the file and recreate to force timestamp # Remove the file and recreate to force timestamp