summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlulf <lulf@FreeBSD.org>2009-02-09 20:13:55 +0000
committerlulf <lulf@FreeBSD.org>2009-02-09 20:13:55 +0000
commit7174fcbb48de047828afa21ca8d4133310384186 (patch)
tree2e3eb41d54eba1ac775d1314bd041540d145a78b
parentc6f2b81096364f46de5feae2d7fe545f95cbabdc (diff)
downloadFreeBSD-src-7174fcbb48de047828afa21ca8d4133310384186.zip
FreeBSD-src-7174fcbb48de047828afa21ca8d4133310384186.tar.gz
- Fix an issue where file attributes were not installed correctly during a Touch
and SetAttrs operation. - SetAttrs and Touch were incorrectly switched.
-rw-r--r--contrib/csup/updater.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/csup/updater.c b/contrib/csup/updater.c
index 3dc10c5..20544ec 100644
--- a/contrib/csup/updater.c
+++ b/contrib/csup/updater.c
@@ -1656,10 +1656,12 @@ updater_rcsedit(struct updater *up, struct file_update *fup, char *name,
if (rf == NULL) {
fattr_maskout(oldfattr, ~FA_MODTIME);
- if (fattr_equal(oldfattr, sr->sr_serverattr) == 0)
+ if (fattr_equal(oldfattr, sr->sr_serverattr))
lprintf(1, " SetAttrs %s", fup->coname);
else
lprintf(1, " Touch %s", fup->coname);
+ /* Install new attributes. */
+ fattr_install(sr->sr_serverattr, fup->destpath, NULL);
if (fup->attic)
lprintf(1, " -> Attic");
lprintf(1, "\n");
OpenPOWER on IntegriCloud