sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: buildinfohelper CustomImagePackage update dependency info 

Instead of keeping the original dependency information for the pool of
CustomImagePackage reset it with each new build.

(Bitbake rev: a0b97ffc7a468bad081ce3276c74728bf6830250)

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:
Michael Wood 2016-02-05 11:13:46 +00:00 committed by Richard Purdie
parent 0fee829932
commit a8ab1c6b25
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bitbake/lib/bb/ui/buildinfohelper.py
View File

@ -558,6 +558,10 @@ class ORMWrapper(object):
else:
packagedict[p]['object'], created = \
CustomImagePackage.objects.get_or_create(name=searchname)
# Clear the Package_Dependency objects as we're going to update
# the CustomImagePackage with the latest dependency information
packagedict[p]['object'].package_dependencies_target.all().delete()
packagedict[p]['object'].package_dependencies_source.all().delete()
try:
recipe = self._cached_get(Recipe,
name=built_recipe.name,
@ -611,21 +615,6 @@ class ORMWrapper(object):
tdeptype = Package_Dependency.TYPE_TRECOMMENDS
try:
# If this is a built package we are always going to have
# new package objects as it's part of the build history
# which also means new package dependency for each object.
# However if they are project packages we don't want to
# duplicate these so check if they exist or not first
if built_package == False:
try:
Package_Dependency.objects.get(
package=packagedict[p]['object'],
depends_on=packagedict[px]['object'],
dep_type=tdeptype)
continue
except Package_Dependency.DoesNotExist:
pass
packagedeps_objs.append(Package_Dependency(
package = packagedict[p]['object'],
depends_on = packagedict[px]['object'],