From 78e3a7877b361e9c3ae4865231d97a47bd8220bc Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Wed, 5 Nov 2014 14:47:51 +0000 Subject: bitbake: toaster: update Release model to pinpoint to specific Branch We update the release model to pinpoint to specific branch, instead of holding a branch name that needs to be matched. This is needed because we move away from mixing branches on different layer sources. Various minor changes to models file. (Bitbake rev: d58aacc69b1832f99758b941803123329e06082d) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- .../lib/toaster/bldcontrol/management/commands/checksettings.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py') diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 9b58587316..08eebceaab 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -150,16 +150,15 @@ class Command(NoArgsCommand): bvo = BitbakeVersion.objects.get(name = ri['bitbake']) assert bvo is not None - ro, created = Release.objects.get_or_create(name = ri['name'], bitbake_version = bvo) + ro, created = Release.objects.get_or_create(name = ri['name'], bitbake_version = bvo, branch = Branch.objects.get( layer_source__name = ri['layersource'], name=ri['branch'])) ro.description = ri['description'] - ro.branch = ri['branch'] + ro.helptext = ri['helptext'] ro.save() for dli in ri['defaultlayers']: - lsi, layername = dli.split(":") layer, created = Layer.objects.get_or_create( - layer_source = LayerSource.objects.get(name = lsi), - name = layername + layer_source = LayerSource.objects.get(name = ri['layersource']), + name = dli ) ReleaseDefaultLayer.objects.get_or_create( release = ro, layer = layer) -- cgit v1.2.3-54-g00ecf