[Title] InstallManager treat post script error better than before.

[Desc.]
[Issue] redmine #9938

Change-Id: Ib53edd4c85db7e4039f3c9a6b35e3f8cc74ddf47

diff --git a/InstallManager_java/installmanager.conf b/InstallManager_java/installmanager.conf
index 5b6a3ee..30c55f2 100644 (file)
--- a/InstallManager_java/installmanager.conf
+++ b/InstallManager_java/installmanager.conf
@@ -3,7 +3,7 @@ InstallManager-Repository:
 Type: 
 Package-Server: 
 Server-Type: snapshot
-InstallManager-Version: 2.0.0
-Distribution: release
+InstallManager-Version: 2.3.0
+Distribution: tizen_2.2
 Release-note: https://developer.tizen.org
 

diff --git a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
index fda0e34..5b01810 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
+++ b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
@@ -89,8 +89,8 @@ public class CliInstall {
                PackageManager pm = PackageManager.getInstance();
                        
                String targetDir = getTargetDir();
-//             Registry.sdkWorkSpacePath = getSDKDataPath();
-//             Config.USER_CONFIG_HOME_PATH = getSDKDataPath();
+               Registry.sdkWorkSpacePath = getSDKDataPath();
+               Config.USER_CONFIG_HOME_PATH = getSDKDataPath();
                
                if (packageNames.contains("all")) {
                        if (checkAvailableSize(getAllPackages(), targetDir)) {

diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Installer.java b/InstallManager_java/src/org/tizen/installmanager/core/Installer.java
index 00b5d68..525b9a8 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/core/Installer.java
+++ b/InstallManager_java/src/org/tizen/installmanager/core/Installer.java
@@ -118,7 +118,10 @@ public class Installer {
                        Log.log("All files moved properly.");
                }
 
-               executeInstallScript(pack, monitor, tempDir);
+               if (!executeInstallScript(pack, monitor, tempDir)) {
+                       Log.err("Fail to execute install script.");
+                       throw new IMFatalException(ErrorCode.INSTALL_SCRIPT_FATAL_ERROR);
+               }
 
                if (!moveRemoveScript(tempDir, pack)) {
                        return false;
@@ -551,18 +554,18 @@ public class Installer {
                // check exit code
                if (exitCode == 0) {
                        return true;
-               } else if (exitCode > 0 && exitCode < 10) {
+               } else if (exitCode == 1) {
                        Log.err("Exit code => " + Integer.toString(exitCode));
                        return false;
                } else if (exitCode == 99) {
                        ErrorController.setInfoCode(InfoCode.RESTART_THE_COMPUTER);
                        Log.log("Set restart message.");
                        return true;
-               }       else {
+               } else {
                        Log.err("Installer.executeScript() install script error => "
                                        + scriptFile.getAbsolutePath());
                        Log.err("Exit code => " + Integer.toString(exitCode));
-                       throw new IMFatalException(ErrorCode.INSTALL_SCRIPT_FATAL_ERROR);
+                       throw new IMFatalException(ErrorCode.SCRIPT_FATAL_ERROR);
                }
        }
 }

diff --git a/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java b/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java
index ffb575e..b0670d9 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java
+++ b/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java
@@ -102,6 +102,7 @@ public class ErrorController {
                PACKAGE_NOT_EXIST_TO_INSTALL_OR_UNINSTALL("Install or uninstall package not found."),
                INSTALL_SCRIPT_NOT_EXISTS("Install script files not found."),
                INSTALL_SCRIPT_FATAL_ERROR("Fatal error occurred while installing the Tizen SDK."),
+               SCRIPT_FATAL_ERROR("Fatal error occurred while executing post script."),
                
                // Network error
                INTERNET_CONNECTION_ERROR("Server connection failed. Check the network status or set InstallManager settings."),