From 2ea48c27f10477b94966509cc2bb0584245a93f8 Mon Sep 17 00:00:00 2001 From: Chulwoo Shin Date: Thu, 9 Feb 2017 01:51:25 +0900 Subject: [PATCH] [TIC-CORE] fix provide's version handling If the provide tag does not hava a version, fix it to use version of package Change-Id: I57ab27779b57f60bf95780fb3c38d5c0ccc6ed69 Signed-off-by: Chulwoo Shin --- tic/dependency.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tic/dependency.py b/tic/dependency.py index 5698375..80b9045 100644 --- a/tic/dependency.py +++ b/tic/dependency.py @@ -118,15 +118,14 @@ def get_installed_packages(recipe, repoinfo, pkg_group): return False def _select_rpm(capability, require): - # TODO: temporary code (to support efl-data capability) - if len(capability) == 1: - return pkg_dict.get(capability[0].get('name')) - provide_list = [] # 1. Choose the rpm included in version from provides if require.get('ver') is not None: for provide in capability: - if _meetRequireVersion(require, provide.get('data')): + ver_data = provide['data'] + if not ver_data.get('ver'): + ver_data = pkg_dict.get(provide['name']).get('version') + if _meetRequireVersion(require, ver_data): provide_list.append(provide) else: provide_list = capability -- 2.7.4