[TIC-Web] fix provide's version handling 07/113607/2
authorChulwoo Shin <cw1.shin@samsung.com>
Wed, 8 Feb 2017 16:36:41 +0000 (01:36 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Wed, 8 Feb 2017 16:43:14 +0000 (01:43 +0900)
If the provide tag does not hava a version,fix it to use version of package

Change-Id: I69dba16374603c3c7c6271c2bf8d934c7a62fa1d
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>
public/src/js/page/package.js

index dce344b..0985bce 100644 (file)
@@ -232,7 +232,7 @@ define([
                     groupPkgList.push(pkg.name);
                 });
                 groups[groupId] = groupPkgList;
-                logger.info('circular dependency: groupId(' + groupId + '), list(' + groupPkgList + ')');
+                // logger.info('circular dependency: groupId(' + groupId + '), list(' + groupPkgList + ')');
             }
         }
 
@@ -254,15 +254,16 @@ define([
         }
 
         function _select_rpm(capability, require) {
-            if (capability.length === 1) {
-                return pkgInfo[capability[0].name];
-            }
-
             var provideList = [];
             // 1. Choose the rpm included in version from provides
             if (require.ver) {
                 _.forEach(capability, function(provide) {
-                    if (_meetRequiredVersion(require, provide.data)) {
+                    var verData = provide.data;
+                    if(!provide.data.ver) {
+                        var pkg = pkgInfo[provide.name];
+                        verData = pkg.version;
+                    }
+                    if (_meetRequiredVersion(require, verData)) {
                         // Meet the required version
                         provideList.push(provide);
                     }
@@ -395,7 +396,7 @@ define([
         function _addConflicts(node) {
             if (!_.isEmpty(node.conflicts)) {
                 _.forEach(node.conflicts, function(conflict) {
-                    logger.info(node.name + ' add conflict rpm : ' + conflict.name);
+                    // logger.info(node.name + ' add conflict rpm : ' + conflict.name);
                     if (_.isEmpty(conflicts[conflict.name])) {
                         conflicts[conflict.name] = [];
                         conflicts[conflict.name].push({'name':node.name, 'data':conflict});