Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Feb 2009 20:13:56 +0000 (UTC)
From:      Ulf Lilleengen <lulf@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r188405 - head/contrib/csup
Message-ID:  <200902092013.n19KDuAF070009@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lulf
Date: Mon Feb  9 20:13:55 2009
New Revision: 188405
URL: http://svn.freebsd.org/changeset/base/188405

Log:
  - Fix an issue where file attributes were not installed correctly during a Touch
    and SetAttrs operation.
  - SetAttrs and Touch were incorrectly switched.

Modified:
  head/contrib/csup/updater.c

Modified: head/contrib/csup/updater.c
==============================================================================
--- head/contrib/csup/updater.c	Mon Feb  9 18:19:58 2009	(r188404)
+++ head/contrib/csup/updater.c	Mon Feb  9 20:13:55 2009	(r188405)
@@ -1656,10 +1656,12 @@ updater_rcsedit(struct updater *up, stru
 
 	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");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902092013.n19KDuAF070009>