diff options
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 74e3588982..c049b4a150 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -558,6 +558,10 @@ class ORMWrapper(object): | |||
558 | else: | 558 | else: |
559 | packagedict[p]['object'], created = \ | 559 | packagedict[p]['object'], created = \ |
560 | CustomImagePackage.objects.get_or_create(name=searchname) | 560 | CustomImagePackage.objects.get_or_create(name=searchname) |
561 | # Clear the Package_Dependency objects as we're going to update | ||
562 | # the CustomImagePackage with the latest dependency information | ||
563 | packagedict[p]['object'].package_dependencies_target.all().delete() | ||
564 | packagedict[p]['object'].package_dependencies_source.all().delete() | ||
561 | try: | 565 | try: |
562 | recipe = self._cached_get(Recipe, | 566 | recipe = self._cached_get(Recipe, |
563 | name=built_recipe.name, | 567 | name=built_recipe.name, |
@@ -611,21 +615,6 @@ class ORMWrapper(object): | |||
611 | tdeptype = Package_Dependency.TYPE_TRECOMMENDS | 615 | tdeptype = Package_Dependency.TYPE_TRECOMMENDS |
612 | 616 | ||
613 | try: | 617 | try: |
614 | # If this is a built package we are always going to have | ||
615 | # new package objects as it's part of the build history | ||
616 | # which also means new package dependency for each object. | ||
617 | # However if they are project packages we don't want to | ||
618 | # duplicate these so check if they exist or not first | ||
619 | if built_package == False: | ||
620 | try: | ||
621 | Package_Dependency.objects.get( | ||
622 | package=packagedict[p]['object'], | ||
623 | depends_on=packagedict[px]['object'], | ||
624 | dep_type=tdeptype) | ||
625 | continue | ||
626 | except Package_Dependency.DoesNotExist: | ||
627 | pass | ||
628 | |||
629 | packagedeps_objs.append(Package_Dependency( | 618 | packagedeps_objs.append(Package_Dependency( |
630 | package = packagedict[p]['object'], | 619 | package = packagedict[p]['object'], |
631 | depends_on = packagedict[px]['object'], | 620 | depends_on = packagedict[px]['object'], |