ehmry/genode-ehmry
ehmry/genode-ehmry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

depot_query: support nested pkgs and raw content

Browse Source
This commit is contained in:
Norman Feske 2018-01-19 16:02:07 +01:00
parent 5641ebcd1b
commit eff67d3131
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
repos/gems/src/app/depot_query/main.cc
View File

@ -298,9 +298,6 @@ Depot_query::Main::_find_rom_in_pkg(Directory::Path const &pkg_path,
archives.for_each_line<Archive::Path>([&] (Archive::Path const &archive_path) {
if (result.valid())
return;
/*
* \throw Archive::Unknown_archive_type
*/
@ -319,11 +316,22 @@ Depot_query::Main::_find_rom_in_pkg(Directory::Path const &pkg_path,
break;
case Archive::RAW:
log(" ", archive_path, " (raw-data archive)");
{
Archive::Path const
rom_path(Archive::user(archive_path), "/raw/",
Archive::name(archive_path), "/",
Archive::version(archive_path), "/", rom_label);
if (_depot_dir.file_exists(rom_path))
result = rom_path;
}
break;
case Archive::PKG:
result = _find_rom_in_pkg(pkg_path, rom_label, recursion_limit);
Archive::Path const result_from_pkg =
_find_rom_in_pkg(archive_path, rom_label, recursion_limit);
if (result_from_pkg.valid())
result = result_from_pkg;
break;
}
});