Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions src/fromager/build_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,10 @@ def get_distributions(self) -> typing.Mapping[str, Version]:
"json.dump({d.name: d.version for d in distributions()}, sys.stdout)",
]
result = self.run([str(self.python), "-c", "; ".join(lines)])
mapping = json.loads(result.strip())
try:
mapping = json.loads(result.strip())
except Exception:
logger.exception("failed to de-serialize JSON: %s", result)
return {name: Version(version) for name, version in sorted(mapping.items())}


Expand Down Expand Up @@ -296,9 +299,13 @@ def prepare_build_environment(
dep_req_type=RequirementType.BUILD_SDIST,
)

logger.debug(
"build env %r has packages %r", build_env.path, build_env.get_distributions()
)
try:
distributions = build_env.get_distributions()
except Exception:
# ignore error for debug call, error reason is logged in get_distributions()
pass
else:
logger.debug("build env %r has packages %r", build_env.path, distributions)

return build_env

Expand Down
2 changes: 0 additions & 2 deletions src/fromager/run_network_isolation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ fi
# set hostname to "localhost"
if command -v hostname 2>&1 >/dev/null; then
hostname localhost
else
echo "'hostname' command is missing, cannot set host name to 'localhost' for $@" >&2
fi

# replace with command
Expand Down
Loading