[Esbox-commits] r2234 - branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences

eswartz at garage.maemo.org eswartz at garage.maemo.org
Mon Sep 28 16:43:14 EEST 2009


Author: eswartz
Date: 2009-09-28 16:43:12 +0300 (Mon, 28 Sep 2009)
New Revision: 2234

Modified:
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
Log:
More safety against letting the user shut down the local Linux machine

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-09-25 16:28:56 UTC (rev 2233)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-09-28 13:43:12 UTC (rev 2234)
@@ -50,6 +50,7 @@
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.maemo.esbox.internal.maemosdk.ui.IHelpID;
 import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
+import org.maemo.mica.common.core.NetworkUtils;
 import org.maemo.mica.common.core.machine.IBuildMachine;
 import org.maemo.mica.common.core.machine.IComposablePreferencePage;
 import org.maemo.mica.common.core.machine.ILocalMachine;
@@ -430,7 +431,11 @@
 		
 		for (int i = 0; i < currentMachines_.length; i++) {
 			IMachine machine = currentMachines_[i];
-			if (machine instanceof ILocalMachine) {
+			
+			// don't shut down local host, either if it was directly selected
+			// or the local host over the local SSH port was used to configure a VM
+			if (machine instanceof ILocalMachine ||
+					(NetworkUtils.isLocalURI(machine.getURI()) && machine.getURI().getPort() == 22)) {
 				currentMachines_[i] = null;	// don't dare shut this down
 				continue;
 			}



More information about the Esbox-commits mailing list