packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2309 from jlebon/pr/prefix-pull 

lib/pull: Add some error-prefixing in dirtree scanning
This commit is contained in:
Colin Walters 2021-03-22 18:58:39 -04:00 committed by GitHub
parent a16be7df6e 36a543ceb1
commit 269ede1015
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-repo-pull.c
View File

@ -706,7 +706,7 @@ scan_dirtree_object (OtPullData *pull_data,
* before libostree's validation was strengthened. * before libostree's validation was strengthened.
*/ */
if (!ot_util_filename_validate (filename, error)) if (!ot_util_filename_validate (filename, error))
return FALSE; return glnx_prefix_error (error, "File %u in dirtree", i);
/* Skip files if we're traversing a request only directory, unless it exactly /* Skip files if we're traversing a request only directory, unless it exactly
* matches the path */ * matches the path */
@ -781,7 +781,7 @@ scan_dirtree_object (OtPullData *pull_data,
/* See comment above for files */ /* See comment above for files */
if (!ot_util_filename_validate (dirname, error)) if (!ot_util_filename_validate (dirname, error))
return FALSE; return glnx_prefix_error (error, "Dir %u in dirtree", i);
if (!pull_matches_subdir (pull_data, path, dirname, TRUE)) if (!pull_matches_subdir (pull_data, path, dirname, TRUE))
continue; continue;
@ -1934,7 +1934,7 @@ scan_one_metadata_object (OtPullData *pull_data,
{ {
if (!scan_dirtree_object (pull_data, checksum, path, recursion_depth, if (!scan_dirtree_object (pull_data, checksum, path, recursion_depth,
pull_data->cancellable, error)) pull_data->cancellable, error))
return FALSE; return glnx_prefix_error (error, "Validating dirtree %s (%s)", checksum, path);
g_hash_table_add (pull_data->scanned_metadata, g_variant_ref (object)); g_hash_table_add (pull_data->scanned_metadata, g_variant_ref (object));
pull_data->n_scanned_metadata++; pull_data->n_scanned_metadata++;