diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2019-07-12 11:26:14 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 09:31:43 +0100 |
| commit | c1a8ebb8f83e5108b667f291c924fc2fbd2ac769 (patch) | |
| tree | b66f60128c3313e6a4cf40a764e7d5751a03fc5c | |
| parent | 813ba5b7c13b573a0b813b628a819bdbf0627540 (diff) | |
| download | bitbake-c1a8ebb8f83e5108b667f291c924fc2fbd2ac769.tar.gz | |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/cache.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 5fb2f17cd..62d43eee3 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) |