diff options
| author | Michael S. Fischer <mfischer@zendesk.com> | 2017-11-27 19:37:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-27 19:37:57 +0000 |
| commit | ef35deaf8aa1dcde061e777c1ee9a43775c7cfcd (patch) | |
| tree | 1a24fcf9a8ee4677894d99d709c7e9324ceb09df | |
| parent | be16d9829f9647bd478daa25c49fd457bb0fa67f (diff) | |
| parent | cdd5e2db99e180bbeb952be0d49769170567970b (diff) | |
| download | squashfs-tools-ef35deaf8aa1dcde061e777c1ee9a43775c7cfcd.tar.gz | |
Merge "unsquashfs: modify xattrs after other changes" am: 2e691e22ee am: 6ba1c45290
am: cdd5e2db99
Change-Id: I0bd4766658d11e7655a7f3b9e19fd3c0b922a603
| -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; } |