[Esbox-commits] r948 - in branches/sdkPlusSupport: org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher

[baranov at garage.maemo.org]

Author: baranov
Date: 2008-11-18 13:55:55 +0200 (Tue, 18 Nov 2008)
New Revision: 948

Modified:
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java
   branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java
Log:
syncronized with trunk

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java	2008-11-18 11:36:44 UTC (rev 947)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java	2008-11-18 11:55:55 UTC (rev 948)
@@ -65,8 +65,7 @@
 						.logError(
 								"Failed to read scratchbox environment; using system environment",
 								e);
-				standardEnv = sdkTarget.getSDK().getMachine()
-						.getStandardEnvironment();
+				standardEnv = sdkTarget.getMachine().getStandardEnvironment();
 			}
 
 			cachedStdEnvMap.put(sdkTarget, standardEnv);

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java	2008-11-18 11:36:44 UTC (rev 947)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java	2008-11-18 11:55:55 UTC (rev 948)
@@ -215,7 +215,7 @@
 	 */
 	@Override
 	protected Process doCreateProcess() throws Exception {
-		return sdkTarget.getSDK().getMachine().createProcess(
+		return sdkTarget.getMachine().createProcess(
 				getLaunchCurrentWorkingDirectory(),
 				getLaunchCommandArguments(),
 				getLaunchEnvironmentModifierBlock(), isUsePTY());

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java	2008-11-18 11:36:44 UTC (rev 947)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java	2008-11-18 11:55:55 UTC (rev 948)
@@ -76,8 +76,7 @@
 						.logError(
 								"Failed to read scratchbox environment; using system environment",
 								e);
-				standardEnv = sdkTarget.getSDK().getMachine()
-						.getStandardEnvironment();
+				standardEnv = sdkTarget.getMachine().getStandardEnvironment();
 			}
 
 			cachedStdEnvMap.put(sdkTarget, standardEnv);

Modified: branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java
===================================================================
--- branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java	2008-11-18 11:36:44 UTC (rev 947)
+++ branches/sdkPlusSupport/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java	2008-11-18 11:55:55 UTC (rev 948)
@@ -110,7 +110,7 @@
 	 */
 	@Override
 	protected Process doCreateProcess() throws Exception {
-		return sdkTarget.getSDK().getMachine().createProcess(
+		return sdkTarget.getMachine().createProcess(
 				getLaunchCurrentWorkingDirectory(),
 				getLaunchCommandArguments(),
 				getLaunchEnvironmentModifierBlock(), isUsePTY());