[oe-commits] [bitbake] 04/05: cache: Remove duplicated lines for provides and rprovides

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 68b3a4fff9ac3996d2d5d11dd08c0db3d22833db
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Fri Jul 12 11:26:14 2019 +0800

    cache: Remove duplicated lines for provides and rprovides
    
    Whether skip or not, they are always set, so move the lines ahead to avoid
    duplicated lines.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cache.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index 5fb2f17..62d43ee 100644
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -83,12 +83,12 @@ class CoreRecipeInfo(RecipeInfoCommon):
         self.appends = self.listvar('__BBAPPEND', metadata)
         self.nocache = self.getvar('BB_DONT_CACHE', metadata)
 
+        self.provides  = self.depvar('PROVIDES', metadata)
+        self.rprovides = self.depvar('RPROVIDES', metadata)
         self.skipreason = self.getvar('__SKIPPED', metadata)
         if self.skipreason:
             self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0]
             self.skipped = True
-            self.provides  = self.depvar('PROVIDES', metadata)
-            self.rprovides = self.depvar('RPROVIDES', metadata)
             return
 
         self.tasks = metadata.getVar('__BBTASKS', False)
@@ -115,9 +115,7 @@ class CoreRecipeInfo(RecipeInfoCommon):
         self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True)
         self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata)
         self.depends          = self.depvar('DEPENDS', metadata)
-        self.provides         = self.depvar('PROVIDES', metadata)
         self.rdepends         = self.depvar('RDEPENDS', metadata)
-        self.rprovides        = self.depvar('RPROVIDES', metadata)
         self.rrecommends      = self.depvar('RRECOMMENDS', metadata)
         self.rprovides_pkg    = self.pkgvar('RPROVIDES', self.packages, metadata)
         self.rdepends_pkg     = self.pkgvar('RDEPENDS', self.packages, metadata)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.