From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 18 06:03:11 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 6DC371065672;
	Fri, 18 Nov 2011 06:03:11 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D8B98FC13;
	Fri, 18 Nov 2011 06:03:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAI63Bf9053959;
	Fri, 18 Nov 2011 06:03:11 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAI63B2W053957;
	Fri, 18 Nov 2011 06:03:11 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201111180603.pAI63B2W053957@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 18 Nov 2011 06:03:11 +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: r227653 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Nov 2011 06:03:11 -0000

Author: linimon (doc,ports committer)
Date: Fri Nov 18 06:03:11 2011
New Revision: 227653
URL: http://svn.freebsd.org/changeset/base/227653

Log:
  Make the new verbosity under control of a flag.

Modified:
  projects/portbuild/scripts/updatesnap

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Fri Nov 18 05:43:43 2011	(r227652)
+++ projects/portbuild/scripts/updatesnap	Fri Nov 18 06:03:11 2011	(r227653)
@@ -10,6 +10,8 @@ pbc=${PORTBUILD_CHECKOUT:-/var/portbuild
 base=${ZFS_MOUNTPOINT}/${SNAP_SRC_DIRECTORY_PREFIX}
 zbase=${ZFS_VOLUME}/${SNAP_SRC_DIRECTORY_PREFIX}
 
+VERBOSE=1
+
 supstamp() {
 	fulldate=$1
         date -j -f %+ "${fulldate}" +%Y.%m.%d.%H.%M.%S
@@ -39,6 +41,7 @@ umask 002
 for branch in $SRC_BRANCHES; do
   mountpoint=${base}${branch}
   if [ ! -d ${mountpoint}/src ]; then
+    echo "creating new source branch under ${mountpoint}"
     mkdir -p ${mountpoint}
     echo "zfs create -o mountpoint=${mountpoint} ${zbase}${branch}"
     zfs create -o mountpoint=${mountpoint} ${zbase}${branch}
@@ -58,13 +61,17 @@ for branch in $SRC_BRANCHES; do
     sed "s|%%DATE%%|${supdate}|;s|%%PREFIX%%|${mountpoint}|;s|%%TAG%%|${tag}|" \
       ${SRC_MASTER_SUPFILE} > ${SRC_SUPFILE}.${branch}.now
     # example destination directory: /a/snap/src-7/src/ (tricky!)
-    echo "csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log"
+    if [ $VERBOSE ]; then
+      echo "csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log"
+    fi
     csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log
     echo ${fulldate} > src/.updated
     # hack for zfs breakiness
     find . -group wheel|xargs chgrp portmgr
     snapdate=$(stamp ${fulldate})
-    echo "zfs snapshot ${zbase}${branch}/src@${snapdate}"
+    if [ $VERBOSE ]; then
+      echo "zfs snapshot ${zbase}${branch}/src@${snapdate}"
+    fi
     zfs snapshot ${zbase}${branch}/src@${snapdate}
   fi
 done