From owner-svn-src-projects@FreeBSD.ORG  Thu Nov 17 03:34:49 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 1FED2106564A;
	Thu, 17 Nov 2011 03:34:49 +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 EB0DE8FC16;
	Thu, 17 Nov 2011 03:34:48 +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 pAH3Ym9d079779;
	Thu, 17 Nov 2011 03:34:48 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAH3Ymi0079777;
	Thu, 17 Nov 2011 03:34:48 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201111170334.pAH3Ymi0079777@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 17 Nov 2011 03:34:48 +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: r227605 - 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: Thu, 17 Nov 2011 03:34:49 -0000

Author: linimon (doc,ports committer)
Date: Thu Nov 17 03:34:48 2011
New Revision: 227605
URL: http://svn.freebsd.org/changeset/base/227605

Log:
  Automatically add new src branches after they are created.  While here,
  improve error handling and make more verbose.

Modified:
  projects/portbuild/scripts/updatesnap

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Thu Nov 17 01:43:50 2011	(r227604)
+++ projects/portbuild/scripts/updatesnap	Thu Nov 17 03:34:48 2011	(r227605)
@@ -36,22 +36,37 @@ echo "Started at $(date)"
 # We need to preserve group writability so portmgr group can write
 umask 002
 
-# for branch in 8; do
 for branch in $SRC_BRANCHES; do
-  cd ${base}${branch}
+  mountpoint=${base}${branch}
+  if [ ! -d ${mountpoint}/src ]; then
+    mkdir -p ${mountpoint}
+    echo "zfs create -o mountpoint=${mountpoint} ${zbase}${branch}"
+    zfs create -o mountpoint=${mountpoint} ${zbase}${branch}
+    mkdir -p ${mountpoint}/src
+    echo "zfs create -o mountpoint=${mountpoint}/src ${zbase}${branch}/src"
+    zfs create -o mountpoint=${mountpoint}/src ${zbase}${branch}/src
+    chown -R portmgr:portmgr ${mountpoint}
+    chmod -R g+w ${mountpoint}
+  fi
+  cd ${mountpoint}
   fulldate=$(date)
   supdate=$(supstamp ${fulldate})
   eval tag=\$SRC_BRANCH_${branch}_TAG
-  cat ${SRC_MASTER_SUPFILE} | \
-    sed "s|%%DATE%%|${supdate}|;s|%%PREFIX%%|${base}${branch}|;s|%%TAG%%|${tag}|" \
-    > ${SRC_SUPFILE}.${branch}.now
-  # example destination directory: /a/snap/src-6/src/ (tricky!)
-  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})
-  zfs snapshot ${zbase}${branch}/src@${snapdate}
+  if [ ! -f ${SRC_MASTER_SUPFILE} ]; then
+    echo "${SRC_MASTER_SUPFILE} does not exist!"
+  else
+    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"
+    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}"
+    zfs snapshot ${zbase}${branch}/src@${snapdate}
+  fi
 done
 
 finish 0