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

Merge pull request #2192 from cgwalters/error-prefixing 

deploy: Add some error prefixing around xattr setting
This commit is contained in:
OpenShift Merge Robot 2020-09-09 09:25:12 -04:00 committed by GitHub
parent 3bac819a5d a1bd29f245
commit 69282a3dd3
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-sysroot-deploy.c
View File

@ -313,7 +313,7 @@ copy_dir_recurse (int src_parent_dfd,
if (!dirfd_copy_attributes_and_xattrs (src_parent_dfd, name, src_dfd_iter.fd, dest_dfd, if (!dirfd_copy_attributes_and_xattrs (src_parent_dfd, name, src_dfd_iter.fd, dest_dfd,
flags, cancellable, error)) flags, cancellable, error))
return FALSE; return glnx_prefix_error (error, "Copying attributes of %s", name);
while (TRUE) while (TRUE)
{ {
@ -340,7 +340,7 @@ copy_dir_recurse (int src_parent_dfd,
dest_dfd, dent->d_name, dest_dfd, dent->d_name,
sysroot_flags_to_copy_flags (GLNX_FILE_COPY_OVERWRITE, flags), sysroot_flags_to_copy_flags (GLNX_FILE_COPY_OVERWRITE, flags),
cancellable, error)) cancellable, error))
return FALSE; return glnx_prefix_error (error, "Copying %s", dent->d_name);
} }
} }
@ -488,7 +488,7 @@ copy_modified_config_file (int orig_etc_fd,
new_etc_fd, path, new_etc_fd, path,
sysroot_flags_to_copy_flags (GLNX_FILE_COPY_OVERWRITE, flags), sysroot_flags_to_copy_flags (GLNX_FILE_COPY_OVERWRITE, flags),
cancellable, error)) cancellable, error))
return FALSE; return glnx_prefix_error (error, "Copying %s", path);
} }
else else
{ {