ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-23 04:25:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sculpt: support incomplete pkg-archive paths

Browse Source 
This adds support for supplying launcher and preset files with pkg-attributes
of the form '<user>/pkg/<name>'.

Fixes genodelabs/genode#5223
This commit is contained in:
Johannes Schlatow 2024-05-21 11:58:56 +02:00 committed by Norman Feske
parent eca864175c
commit a5c7b20196
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
repos/gems/run/sculpt.run
View File

@ -1012,11 +1012,25 @@ proc augment_pkg_versions { path node } {
set content [read $fd]
close $fd
# filter 'pkg' attribute
set pattern "(\<$node\[^\>\]+?pkg=\")(\[^/\]+)(\")"
# filter 'pkg' attribute that is not <user>/pkg/<
set pattern "(\<$node\[^\>]+?pkg=\")"
append pattern {(?![\w\d\-]+/pkg/[\w\d\-_]+/[\w\d\-\._]+)(.*)}
append pattern "(\")"
while {[regexp $pattern $content dummy head pkg tail]} {
set pkg_path [depot_user]/pkg/[current_pkg $pkg]
regsub $pattern $content "$head$pkg_path$tail" content
if {[regexp [_depot_archive_path_pattern] $pkg dummy user type name]
&& $type == "pkg"} {
set pkg_path $user/pkg/[current_pkg $name]
regsub $pattern $content "$head$pkg_path$tail" content
} elseif {![regexp {/} $pkg dummy]} {
set pkg_path [depot_user]/pkg/[current_pkg $pkg]
regsub $pattern $content "$head$pkg_path$tail" content
} else {
puts stderr "Error: malformed depot-archive path '$pkg',"
puts stderr " expected '<user>/pkg/<name>' or"
puts stderr " '<name>' or"
puts stderr " '<user>/pkg/<name>/<version>'"
exit
}
}
# write back the filtered launcher snippet, deploy config, or preset