From owner-svn-src-projects@FreeBSD.ORG Fri Nov 16 19:41:56 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 926F1B7D; Fri, 16 Nov 2012 19:41:56 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 94F908FC13; Fri, 16 Nov 2012 19:41:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAGJftN0050983; Fri, 16 Nov 2012 19:41:55 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAGJfttr050982; Fri, 16 Nov 2012 19:41:55 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201211161941.qAGJfttr050982@svn.freebsd.org> From: Mark Linimon Date: Fri, 16 Nov 2012 19:41:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243159 - projects/portbuild/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 16 Nov 2012 19:41:56 -0000 Author: linimon (doc,ports committer) Date: Fri Nov 16 19:41:55 2012 New Revision: 243159 URL: http://svnweb.freebsd.org/changeset/base/243159 Log: Now that this is tested, enable svn and zfs. Modified: projects/portbuild/scripts/updatesnap Modified: projects/portbuild/scripts/updatesnap ============================================================================== --- projects/portbuild/scripts/updatesnap Fri Nov 16 19:39:29 2012 (r243158) +++ projects/portbuild/scripts/updatesnap Fri Nov 16 19:41:55 2012 (r243159) @@ -74,26 +74,26 @@ for branch in $SRC_BRANCHES; do if [ ! -d ${mountpoint}/src ]; then mkdir ${mountpoint}/src || finish 1 fi - if [ ! -d .svn ]; then + if [ ! -d ${mountpoint}/src/.svn ]; then if [ $VERBOSE ]; then - # XXX MCL 20121115 gotta do the substitution here! + # XXX MCL 20121115 gotta do the substitution here, if it's not head! echo "svn checkout svn://svn.freebsd.org/base/head ${mountpoint}/src" fi - #svn checkout svn://svn.freebsd.org/base/head ${mountpoint}/src || finish 1 + svn checkout svn://svn.freebsd.org/base/head ${mountpoint}/src || finish 1 else if [ $VERBOSE ]; then echo "svn up" fi - #svn up || finish 1 + svn up || finish 1 fi echo ${fulldate} > src/.updated # hack for zfs breakiness find . -group wheel|xargs chgrp portmgr snapdate=$(stamp ${fulldate}) if [ $VERBOSE ]; then - echo "#zfs snapshot ${zbase_prefix}${branch}/src@${snapdate}" + echo "zfs snapshot ${zbase_prefix}${branch}/src@${snapdate}" fi - #zfs snapshot ${zbase_prefix}${branch}/src@${snapdate} || finish 1 + zfs snapshot ${zbase_prefix}${branch}/src@${snapdate} || finish 1 done finish 0