Skip to content

Random Fixes #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

Random Fixes #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
281599f
archive: ignore DNS resolution errors on download
jkloetzke Apr 28, 2025
61c2048
builder: normalize paths to spec and friends
jkloetzke Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pym/bob/archive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import os.path
import shutil
import signal
import socket
import struct
import subprocess
import tarfile
Expand Down Expand Up @@ -450,6 +451,8 @@
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)

Check warning on line 455 in pym/bob/archive.py

View check run for this annotation

Codecov / codecov/patch

pym/bob/archive.py#L455 

Added line #L455 was not covered by tests
except BuildError as e:
raise
except OSError as e:
Expand Down
8 changes: 4 additions & 4 deletions pym/bob/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down