Merge pull request #638 from jkloetzke/fixes

Random Fixes

Author: jkloetzke

pym/bob/archive.py

@@ -35,6 +35,7 @@
 import os.path
 import shutil
 import signal
+import socket
 import struct
 import subprocess
 import tarfile
@@ -450,6 +451,8 @@ def _downloadPackage(self, buildId, suffix, audit, content, caches, workspace):
             return (False, self._namedErrorString(e.reason), WARNING)
         except ConnectionRefusedError:
             return (False, self._namedErrorString("connection failed"), WARNING)
+        except (socket.herror, socket.gaierror) as e:
+            return (False, self._namedErrorString(str(e)), WARNING)
         except BuildError as e:
             raise
         except OSError as e:

pym/bob/builder.py

@@ -725,10 +725,10 @@ async def _runShell(self, step, scriptName, logger, workspaceCreated, cleanWorks
         self.__linkDependencies(step)
 
         # write spec
-        specFile = os.path.join(workspacePath, "..", "step.spec")
-        envFile = os.path.join(workspacePath, "..", "env")
-        logFile = os.path.join(workspacePath, "..", "log.txt")
-        scriptHint = os.path.join(workspacePath, "..", "script")
+        specFile = os.path.normpath(os.path.join(workspacePath, "..", "step.spec"))
+        envFile = os.path.normpath(os.path.join(workspacePath, "..", "env"))
+        logFile = os.path.normpath(os.path.join(workspacePath, "..", "log.txt"))
+        scriptHint = os.path.normpath(os.path.join(workspacePath, "..", "script"))
         spec = StepSpec.fromStep(step, envFile, self.__envWhiteList, logFile,
             scriptHint=scriptHint, isJenkins=step.JENKINS,
             slimSandbox=self.__slimSandbox)