billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow 'minil dist' to return 0 when it failed.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-04-13 18:33:18 +01:00 • committed by Jelmer Vernooij
parent 205a929b90
commit 64b0c5816a
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ognibuild/buildsystem.py
View file

@ -24,7 +24,7 @@ import shlex
from typing import Optional, Tuple from typing import Optional, Tuple
import warnings import warnings
from . import shebang_binary, UnidentifiedError from . import shebang_binary, UnidentifiedError, DetailedFailure
from .dist_catcher import DistCatcher from .dist_catcher import DistCatcher
from .outputs import ( from .outputs import (
BinaryOutput, BinaryOutput,
@ -44,7 +44,7 @@ from .requirements import (
GoRequirement, GoRequirement,
GoPackageRequirement, GoPackageRequirement,
) )
from .fix_build import run_with_build_fixers from .fix_build import run_with_build_fixers, find_build_failure_description
from .session import which from .session import which
@ -1468,7 +1468,14 @@ class PerlBuildTiny(BuildSystem):
self.setup(session, fixers) self.setup(session, fixers)
with DistCatcher([session.external_path('.')]) as dc: with DistCatcher([session.external_path('.')]) as dc:
if self.minilla: if self.minilla:
run_with_build_fixers(session, ["minil", "dist"], fixers) lines = run_with_build_fixers(session, ["minil", "dist"], fixers)
# minil seems to return 0 even if it didn't produce a tarball :(
if not dc.find_files():
match, error = find_build_failure_description(lines)
if error:
raise DetailedFailure(0, ["minil", "dist"], error)
else:
raise UnidentifiedError(0, ["minil", "dist"], lines, match)
else: else:
try: try:
run_with_build_fixers(session, ["./Build", "dist"], fixers) run_with_build_fixers(session, ["./Build", "dist"], fixers)