bitbake: Revert "bitbake: toaster: don't re-create Target objects"
This delete followed up the foreign keys and deleted things that were
not expected to be deleted.
This reverts commit 08000eb27e
.
(Bitbake rev: 46b119eb62a5a612fe4c0847862d34f408e556f7)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e6d967dba2
commit
fe29297c6a
|
@ -162,6 +162,8 @@ class ORMWrapper(object):
|
||||||
build.bitbake_version=build_info['bitbake_version']
|
build.bitbake_version=build_info['bitbake_version']
|
||||||
build.save()
|
build.save()
|
||||||
|
|
||||||
|
Target.objects.filter(build = build).delete()
|
||||||
|
|
||||||
else:
|
else:
|
||||||
build = Build.objects.create(
|
build = Build.objects.create(
|
||||||
project = prj,
|
project = prj,
|
||||||
|
@ -182,6 +184,19 @@ class ORMWrapper(object):
|
||||||
|
|
||||||
return build
|
return build
|
||||||
|
|
||||||
|
def create_target_objects(self, target_info):
|
||||||
|
assert 'build' in target_info
|
||||||
|
assert 'targets' in target_info
|
||||||
|
|
||||||
|
targets = []
|
||||||
|
for tgt_name in target_info['targets']:
|
||||||
|
tgt_object = Target.objects.create( build = target_info['build'],
|
||||||
|
target = tgt_name,
|
||||||
|
is_image = False,
|
||||||
|
)
|
||||||
|
targets.append(tgt_object)
|
||||||
|
return targets
|
||||||
|
|
||||||
def update_build_object(self, build, errors, warnings, taskfailures):
|
def update_build_object(self, build, errors, warnings, taskfailures):
|
||||||
assert isinstance(build,Build)
|
assert isinstance(build,Build)
|
||||||
assert isinstance(errors, int)
|
assert isinstance(errors, int)
|
||||||
|
@ -911,7 +926,7 @@ class BuildInfoHelper(object):
|
||||||
target_information['targets'] = event._pkgs
|
target_information['targets'] = event._pkgs
|
||||||
target_information['build'] = build_obj
|
target_information['build'] = build_obj
|
||||||
|
|
||||||
self.internal_state['targets'] = Target.objects.filter(build=target_information['build'])
|
self.internal_state['targets'] = self.orm_wrapper.create_target_objects(target_information)
|
||||||
|
|
||||||
# Save build configuration
|
# Save build configuration
|
||||||
data = self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0]
|
data = self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0]
|
||||||
|
|
Loading…
Reference in New Issue