better fix for amplab-extras/SparkR-pkg#53

Merge branch 'namespace-fix'

Conflicts:
	pkg/inst/worker/worker.R

Author: piccolbo

pkg/inst/worker/worker.R

@@ -39,30 +39,26 @@ sink(stderr())
 # read function dependencies
 depsLen <- readInt(inputCon)
 if (depsLen > 0) {
-	execFunctionDeps <- readRawLen(inputCon, depsLen)
+  execFunctionDeps <- readRawLen(inputCon, depsLen)
+
+  # load the dependencies into current environment
+  depsFileName <- tempfile(pattern="spark-exec", fileext=".deps")
+  depsFile <- file(depsFileName, open="wb")
+  writeBin(execFunctionDeps, depsFile, endian="big")
+  close(depsFile)
 }
+
 # Include packages as required
 packageNames <- unserialize(readRaw(inputCon))
 for (pkg in packageNames) {
-	suppressPackageStartupMessages(require(as.character(pkg), character.only=TRUE))
+  suppressPackageStartupMessages(require(as.character(pkg), character.only=TRUE))
 }
+
 if (depsLen > 0) {
-	# load the dependencies into current environment
-	depsFileName <- tempfile(pattern="spark-exec", fileext=".deps")
-	depsFile <- file(depsFileName, open="wb")
-	writeBin(execFunctionDeps, depsFile, endian="big")
-	close(depsFile)
-	
 	load(depsFileName)
 	unlink(depsFileName)
 }
 
-# Include packages as required
-packageNames <- unserialize(readRaw(inputCon))
-for (pkg in packageNames) {
-  suppressPackageStartupMessages(require(as.character(pkg), character.only=TRUE))
-}
-
 # Read and set broadcast variables
 numBroadcastVars <- readInt(inputCon)
 if (numBroadcastVars > 0) {