From 110f37f730bd10e00fdc47474975f8906e4ef21c Mon Sep 17 00:00:00 2001
From: "donghyuk.yang" <donghyuk.yang@samsung.com>
Date: Thu, 7 Mar 2013 20:35:07 +0900
Subject: [PATCH] [Title] Fixed bug for installing package to rootstrap if
 proxy is null

---
 .../org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java   |  6 +++++-
 .../org/tizen/nativeplatform/repository/LocalRepoMounter.java  |  8 ++++++--
 .../nativeplatform/views/ui/RootstrapUIMessages.properties     |  1 +
 .../src/org/tizen/nativeplatform/views/ui/RootstrapView.java   | 10 ++++++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java
index 94163bc..f7e24f9 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java
@@ -76,7 +76,11 @@ public class RPMPackageCommander {
 	}
 
 	public static void setHttpProxy(String proxy) {
-		http_proxy = proxy;
+		if (proxy == null) {
+			return;
+		} else {
+			http_proxy = proxy;			
+		}
 	}
 
 	public static void DistUpgradeRootstrap(String path,
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/repository/LocalRepoMounter.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/repository/LocalRepoMounter.java
index 9ebba74..92e68a7 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/repository/LocalRepoMounter.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/repository/LocalRepoMounter.java
@@ -191,7 +191,7 @@ public class LocalRepoMounter {
 			Logger.info(String.format("Package Manager - Failed to mount repository\n-%s", 
 					repoLocalPath));
 		} else {
-			Logger.info(String.format("Package Manager - Mount repository successfully\n-%s", 
+			Logger.info(String.format("Package Manager - %s is mounted\n", 
 					repoLocalPath));
 		}
 		
@@ -236,13 +236,17 @@ public class LocalRepoMounter {
 					}
 					*/					
 				}				
+			} else {
+				Logger.info(String.format("Package Manager - %s is not mounted\n", 
+						repoLocalPath));
+				return true;
 			}
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}
 		
 		if (result) {
-			Logger.info(String.format("Package Manager - Unmount repository successfully\n-%s", 
+			Logger.info(String.format("Package Manager - %s is unmounted\n", 
 					repoLocalPath));
 		} else {
 			Logger.info(String.format("Package Manager - Failed to unmount repository\n-%s", 
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapUIMessages.properties b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapUIMessages.properties
index b72ebe1..a227efb 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapUIMessages.properties
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapUIMessages.properties
@@ -73,6 +73,7 @@ LocalRepoTab.Error.Empty.Repo = Repository path is empty
 
 Action.Msg.Error.SelectRootstrap = The "%s" rootstrap can not be selected at "%s" configuration because of architecture mismatch.
 Action.Msg.Error.RemoveDefault = Cannot remove basic rootstrap!  
+Action.Msg.Error.RemoveFailed = Failed to remove rootstrap!
 Action.Msg.Progress.Exporting = Exporting rootstrap...
 Action.Msg.Error.ExportUninitialzed = Cannot export uninitialized rootstrap!  
 Action.Msg.Info.ExportOK = Exporting rootstrap is successful!
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java
index a887c08..036190e 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java
@@ -869,8 +869,14 @@ public class RootstrapView extends ViewPart {
             		setActiveRootstrap( proj, defaultRootstrap );
             	}
             	
-            	// remove 
-            	RootstrapManager.removeRootstrap(selected.getId());
+            	// umount repository
+            	ArrayList<IPath> failedPaths = LocalRepoMounter.umountLocalRepository(selected, null);
+            	if(failedPaths.size() == 0) {            	
+            		// remove 
+            		RootstrapManager.removeRootstrap(selected.getId());
+            	} else {
+            		DialogUtil.openErrorDialog(resources.getString("Action.Msg.Error.RemoveFailed"));
+            	}
             }
 
             @Override
-- 
2.7.4