Skip to content

Prefer system check which result in a new recipe should be treated as normal packages #919

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
ktf merged 2 commits into from
Apr 14, 2025
Merged

Prefer system check which result in a new recipe should be treated as normal packages #919

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d4bcf
Prefer system check which result in a new recipe should be treated as…
ktf Apr 14, 2025
ac300a8
Merge branch 'master' into pr919
ktf Apr 14, 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
12 changes: 8 additions & 4 deletions alibuild_helpers/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,8 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
noSystemList = [spec["package"]]
elif noSystem is not None:
noSystemList = noSystem.split(",")

if (spec["package"] not in noSystemList) and (preferSystem or systemREMatches):
systemExcluded = (spec["package"] in noSystemList)
if (preferSystem or systemREMatches):
requested_version = resolve_version(spec, defaults, "unavailable", "unavailable")
cmd = "REQUESTED_VERSION={version}\n{check}".format(
version=quote(requested_version),
Expand All @@ -523,12 +523,16 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
else:
# prefer_system_check succeeded; this means we should use the system package.
match = re.search(r"^alibuild_system_replace:(?P<key>.*)$", output, re.MULTILINE)
if not match:
if not match and systemExcluded:
# No replacement spec name given. Fall back to old system package
# behaviour and just disable the package.
ownPackages.add(spec["package"])
elif not match and not systemExcluded:
# No replacement spec name given. Fall back to old system package
# behaviour and just disable the package.
systemPackages.add(spec["package"])
disable.append(spec["package"])
else:
elif match:
# The check printed the name of a replacement; use it.
key = match.group("key").strip()
replacement = None
Expand Down
Loading