Skip to content

Commit 62a34bc

Browse files
authored
[AutoBuild] Check validity of package name directly in build_tarballs (#1117)
By moving this check earlier, we avoid bad surprises after a potentially long compilation.
1 parent ad8188c commit 62a34bc

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/AutoBuild.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ function build_tarballs(ARGS, src_name, src_version, sources, script,
124124
return nothing
125125
end
126126

127+
if !Base.isidentifier(src_name)
128+
error("Package name \"$(src_name)\" is not a valid identifier")
129+
end
130+
127131
# Throw an error if we're going to build for platforms not supported by Julia v1.5-.
128132
if any(p -> arch(p) == "armv6l" || (Sys.isapple(p) && arch(p) == "aarch64"), platforms) && minimum(VersionNumber(rng.lower.t) for rng in PKG_VERSIONS.semver_spec(julia_compat).ranges) < v"1.6"
129133
error("Experimental platforms cannot be used with Julia v1.5-.\nChange `julia_compat` to require at least Julia v1.6")
@@ -475,9 +479,6 @@ function register_jll(name, build_version, dependencies, julia_compat;
475479
gh_username=gh_get_json(DEFAULT_API, "/user"; auth=gh_auth)["login"],
476480
lazy_artifacts::Bool=false,
477481
kwargs...)
478-
if !Base.isidentifier(name)
479-
error("Package name \"$(name)\" is not a valid identifier")
480-
end
481482
# Calculate tree hash of wrapper code
482483
wrapper_tree_hash = bytes2hex(Pkg.GitTools.tree_hash(code_dir))
483484
wrapper_commit_hash = LibGit2.head(code_dir)
@@ -1079,9 +1080,6 @@ function build_jll_package(src_name::String,
10791080
julia_compat::String = DEFAULT_JULIA_VERSION_SPEC,
10801081
lazy_artifacts::Bool = false,
10811082
init_block = "")
1082-
if !Base.isidentifier(src_name)
1083-
error("Package name \"$(src_name)\" is not a valid identifier")
1084-
end
10851083
# Make way, for prince artifacti
10861084
mkpath(joinpath(code_dir, "src", "wrappers"))
10871085

0 commit comments

Comments
 (0)