diff options
author | Jonathan Lebon <jonathan@jlebon.com> | 2021-03-22 16:31:06 -0400 |
---|---|---|
committer | Jonathan Lebon <jonathan@jlebon.com> | 2021-03-22 16:32:11 -0400 |
commit | 36a543ceb1b2f87eac71f7434400690c9678b011 (patch) | |
tree | 979258ae783cf1e7bec7237d75b7fba4b4295a7a /src/libostree | |
parent | a16be7df6e663b88096c1351a8a386b50c288620 (diff) | |
download | ostree-36a543ceb1b2f87eac71f7434400690c9678b011.tar.gz |
lib/pull: Add some error-prefixing in dirtree scanning
I think these are the paths involved in the error message at
https://github.com/coreos/rpm-ostree/issues/2250.
Diffstat (limited to 'src/libostree')
-rw-r--r-- | src/libostree/ostree-repo-pull.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index c63bdc4a..ab47a2a4 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -706,7 +706,7 @@ scan_dirtree_object (OtPullData *pull_data, * before libostree's validation was strengthened. */ 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 * matches the path */ @@ -781,7 +781,7 @@ scan_dirtree_object (OtPullData *pull_data, /* See comment above for files */ 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)) continue; @@ -1934,7 +1934,7 @@ scan_one_metadata_object (OtPullData *pull_data, { if (!scan_dirtree_object (pull_data, checksum, path, recursion_depth, 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)); pull_data->n_scanned_metadata++; |