[TIC-CORE] fix provide's version handling 15/113615/1
authorChulwoo Shin <cw1.shin@samsung.com>
Wed, 8 Feb 2017 16:51:25 +0000 (01:51 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Wed, 8 Feb 2017 16:51:25 +0000 (01:51 +0900)
If the provide tag does not hava a version, fix it to use version of
package

Change-Id: I57ab27779b57f60bf95780fb3c38d5c0ccc6ed69
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>
tic/dependency.py

index 5698375..80b9045 100644 (file)
@@ -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