[Title] If use -p all option, -skip option does not work.

[Desc.] -skip option works well when use -p all option.
[Issue] redmine #10136

Change-Id: I2107dcd7ab70b503ba18a8910f56b4cc5c6ecd85

diff --git a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
index eb6b162..fd8f55a 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
+++ b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
@@ -93,9 +93,11 @@ public class CliInstall {
                Registry.sdkWorkSpacePath = getSDKDataPath();
                Config.USER_CONFIG_HOME_PATH = getSDKDataPath();
                
+               PackageSet skipPackages = pm.getPackagesByNames(Options.skipPackages);
+               
                if (packageNames.contains("all")) {
                        if (checkAvailableSize(getAllPackages(), targetDir)) {
-                               return installPackages(getAllPackages(), targetDir);                            
+                               return installPackages(pm.diff(getAllPackages(), skipPackages), targetDir);                             
                        }
                } else if (!validateInstallPkgs(pm, packageNames)) {
                        return false;
@@ -107,8 +109,7 @@ public class CliInstall {
                List<String> installableMetaNames = getInstallableMetas(pm, packageNames);
                PackageSet installableMetas = pm.getPackagesByNames(installableMetaNames);
                PackageSet installablePackages = pm.getDependsPackagesFromRepository(installableMetas);
-               PackageSet skipPackages = pm.getPackagesByNames(Options.skipPackages);
-               
+
                if (!skipPackages.isEmpty()) {
                        Log.log("Installation skip packages : " + skipPackages);
                        installablePackages = pm.diff(installablePackages, skipPackages);