diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-27 19:28:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-27 19:28:02 +0000 |
| commit | 2e691e22eeb62e3a7de90aefc30b7ead94f6c26b (patch) | |
| tree | 1a24fcf9a8ee4677894d99d709c7e9324ceb09df | |
| parent | c9a634fc39003109045b9239c52e8f2a759c6c15 (diff) | |
| parent | c07451606ba95bd4666df6d4251017de4928b0f3 (diff) | |
| download | squashfs-tools-2e691e22eeb62e3a7de90aefc30b7ead94f6c26b.tar.gz | |
Merge "unsquashfs: modify xattrs after other changes"
| -rw-r--r-- | squashfs-tools/unsquashfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c index 7f46968..0dbc4c2 100644 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c @@ -826,8 +826,6 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time, { struct utimbuf times = { time, time }; - write_xattr(pathname, xattr); - if(utime(pathname, ×) == -1) { ERROR("set_attributes: failed to set time on %s, because %s\n", pathname, strerror(errno)); @@ -850,6 +848,8 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time, return FALSE; } + write_xattr(pathname, xattr); + return TRUE; } |