From owner-svn-src-projects@FreeBSD.ORG Sun Feb 15 21:51:32 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A8CD1065672; Sun, 15 Feb 2009 21:51:32 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 709F58FC1D; Sun, 15 Feb 2009 21:51:32 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1FLpWbG000459; Sun, 15 Feb 2009 21:51:32 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1FLpW2T000457; Sun, 15 Feb 2009 21:51:32 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200902152151.n1FLpW2T000457@svn.freebsd.org> From: Ulf Lilleengen Date: Sun, 15 Feb 2009 21:51:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188657 - projects/csup_wip/contrib/csup X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Feb 2009 21:51:33 -0000 Author: lulf Date: Sun Feb 15 21:51:32 2009 New Revision: 188657 URL: http://svn.freebsd.org/changeset/base/188657 Log: MFH r188644: - Do not free the pattern lists immediately after use, as they might be needed again in case the connection is interrupted and csup have to reconnect. The lists will be freed after the collection has been completely processed. MFH r188405: - Fix an issue where file attributes were not installed correctly during a Touch and SetAttrs operation. - SetAttrs and Touch were incorrectly switched. Modified: projects/csup_wip/contrib/csup/ (props changed) projects/csup_wip/contrib/csup/proto.c projects/csup_wip/contrib/csup/updater.c Modified: projects/csup_wip/contrib/csup/proto.c ============================================================================== --- projects/csup_wip/contrib/csup/proto.c Sun Feb 15 21:17:21 2009 (r188656) +++ projects/csup_wip/contrib/csup/proto.c Sun Feb 15 21:51:32 2009 (r188657) @@ -521,12 +521,6 @@ proto_xchgcoll(struct config *config) coll->co_filefilter = globtree_and(fileaccept, globtree_not(filerefuse)); - /* At this point we don't need the pattern lists anymore. */ - pattlist_free(coll->co_accepts); - pattlist_free(coll->co_refusals); - coll->co_accepts = NULL; - coll->co_refusals = NULL; - /* Set up a mask of file attributes that we don't want to sync with the server. */ if (!(coll->co_options & CO_SETOWNER)) Modified: projects/csup_wip/contrib/csup/updater.c ============================================================================== --- projects/csup_wip/contrib/csup/updater.c Sun Feb 15 21:17:21 2009 (r188656) +++ projects/csup_wip/contrib/csup/updater.c Sun Feb 15 21:51:32 2009 (r188657) @@ -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");